aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gmail.com>2015-02-21 01:48:35 -0500
committerTim Harder <radhermit@gmail.com>2015-02-21 01:48:35 -0500
commit51fc4401d320b823faa7f74560b29a0b7f12a1c1 (patch)
treef08e2e3c841909e0e81959b877c0491e2c6d0229
parentpmerge: always add the sets attr to the options namespace (diff)
downloadpkgcore-51fc4401d320b823faa7f74560b29a0b7f12a1c1.tar.gz
pkgcore-51fc4401d320b823faa7f74560b29a0b7f12a1c1.tar.bz2
pkgcore-51fc4401d320b823faa7f74560b29a0b7f12a1c1.zip
pmerge: make sure targets is always a list when storing values
-rw-r--r--pkgcore/scripts/pmerge.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgcore/scripts/pmerge.py b/pkgcore/scripts/pmerge.py
index d41cf5f80..c137c240a 100644
--- a/pkgcore/scripts/pmerge.py
+++ b/pkgcore/scripts/pmerge.py
@@ -43,6 +43,8 @@ class StoreTarget(argparse._AppendAction):
argparse._AppendAction.__call__(
self, parser, namespace,
parserestrict.parse_match(x), option_string=option_string)
+ if namespace.targets is None:
+ namespace.targets = []
namespace.sets = sets
@@ -311,8 +313,6 @@ def update_worldset(world_set, pkg, remove=False):
@argparser.bind_final_check
def _validate(parser, namespace):
if namespace.sets:
- if namespace.targets is None:
- namespace.targets = []
namespace.targets.extend(chain.from_iterable(
namespace.config.pkgset[x] for x in namespace.sets))
if namespace.unmerge: