summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCasey Dahlin <cdahlin@redhat.com>2009-01-04 08:44:23 -0500
committerCasey Dahlin <cdahlin@redhat.com>2009-01-04 08:44:23 -0500
commit1b3d3649d5375a324ee62e34abd95fc8ce1205cb (patch)
tree2287e3617b4743f871dbd2567523544772c88274
parentbd69d3a1bbc71e0e6464edb3c684c41497d3801a (diff)
downloadupstate-1b3d3649d5375a324ee62e34abd95fc8ce1205cb.tar.gz
upstate-1b3d3649d5375a324ee62e34abd95fc8ce1205cb.tar.xz
upstate-1b3d3649d5375a324ee62e34abd95fc8ce1205cb.zip
Correct Category fill method
It now intersects the fill values with the existing arguments
-rw-r--r--category.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/category.py b/category.py
index eda7ab7..ad33774 100644
--- a/category.py
+++ b/category.py
@@ -120,8 +120,6 @@ class Category:
for key, value in self.args.iteritems():
if not info.has_key(key):
args[key] = value
- elif not value.singular():
- args[key] = info[key]
else:
- args[key] = value
+ args[key] = value.intersect(info[key])
return Category(self.name, **args)