From 91d8a0aa5cdec2755ff28eb4d78b40a49b5477fb Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Fri, 5 Oct 2007 22:07:23 +0000 Subject: handle empty sets properly svn path=/main/trunk/; revision=7974 --- pym/emerge/__init__.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index c12b5d8e0..080248b8d 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -6407,6 +6407,7 @@ def emerge_main(): setconfig = make_default_config(settings, trees[settings["ROOT"]]) del setconfigpaths if myaction not in ["search", "metadata", "sync"]: + oldargs = myfiles[:] packagesets, setconfig_errors = setconfig.getSetsWithAliases() for s in packagesets: if s in myfiles: @@ -6414,10 +6415,19 @@ def emerge_main(): if myaction in ["unmerge", "prune", "clean", "depclean"] and not packagesets[s].supportsOperation("unmerge"): print "emerge: the given set %s does not support unmerge operations" % s sys.exit(1) - myfiles.extend(packagesets[s].getAtoms()) + if not packagesets[s].getAtoms(): + print "emerge: '%s' is an empty set" % s + else: + myfiles.extend(packagesets[s].getAtoms()) for e in packagesets[s].errors: print e myfiles.remove(s) + # Need to handle empty sets specially, otherwise emerge will react + # with the help message for empty argument lists + if oldargs and not myfiles: + print "emerge: no targets left after set expansion" + sys.exit(0) + del oldargs if ("--tree" in myopts) and ("--columns" in myopts): print "emerge: can't specify both of \"--tree\" and \"--columns\"." -- cgit v1.2.3-1-g7c22