| Message ID | 1fe125a3ceecd79516542b978b8e651a4e2186e9.1427150990.git.yann.morin.1998@free.fr |
|---|---|
| State | Changes Requested |
| Headers | show |
Hi Yann, all, On Mon, Mar 23, 2015 at 11:56 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote: > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Cc: Francois Perrad <fperrad@gmail.com> > --- > support/scripts/graph-depends | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends > index a2310c0..c39dd64 100755 > --- a/support/scripts/graph-depends > +++ b/support/scripts/graph-depends > @@ -24,6 +24,7 @@ > import sys > import subprocess > import argparse > +from fnmatch import fnmatch > > # Modes of operation: > MODE_FULL = 1 # draw full dependency graph for all selected packages > @@ -43,6 +44,7 @@ parser.add_argument("--depth", '-d', metavar="DEPTH", dest="depth", type=int, de > help="Limit the dependency graph to DEPTH levels; 0 means no limit.") > parser.add_argument("--stop-on", "-s", metavar="PACKAGE", dest="stop_list", action="append", > help="do not graph past this package (can be given multiple times)." \ > + + " Can be a package name or a glob, or" \ > + " 'virtual' to stop on virtual packages.") > parser.add_argument("--colours", "-c", metavar="COLOR_LIST", dest="colours", > default="lightblue,grey,gainsboro", > @@ -312,8 +314,9 @@ def print_pkg_deps(depth, pkg): > print_attrs(pkg) > if pkg not in dict_deps: > return > - if pkg in stop_list: > - return > + for p in stop_list: > + if fnmatch(pkg,p): Nitpicking: missing space after the coma. ;-) > + return > if dict_version.get(pkg) == "virtual" and "virtual" in stop_list: > return > if max_depth == 0 or depth < max_depth: > -- > 1.9.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot Otherwise, you got my: Reviewed-by: Samuel Martin <s.martin49@gmail.com> Regards,
diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index a2310c0..c39dd64 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -24,6 +24,7 @@ import sys import subprocess import argparse +from fnmatch import fnmatch # Modes of operation: MODE_FULL = 1 # draw full dependency graph for all selected packages @@ -43,6 +44,7 @@ parser.add_argument("--depth", '-d', metavar="DEPTH", dest="depth", type=int, de help="Limit the dependency graph to DEPTH levels; 0 means no limit.") parser.add_argument("--stop-on", "-s", metavar="PACKAGE", dest="stop_list", action="append", help="do not graph past this package (can be given multiple times)." \ + + " Can be a package name or a glob, or" \ + " 'virtual' to stop on virtual packages.") parser.add_argument("--colours", "-c", metavar="COLOR_LIST", dest="colours", default="lightblue,grey,gainsboro", @@ -312,8 +314,9 @@ def print_pkg_deps(depth, pkg): print_attrs(pkg) if pkg not in dict_deps: return - if pkg in stop_list: - return + for p in stop_list: + if fnmatch(pkg,p): + return if dict_version.get(pkg) == "virtual" and "virtual" in stop_list: return if max_depth == 0 or depth < max_depth:
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Francois Perrad <fperrad@gmail.com> --- support/scripts/graph-depends | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)