aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Harvey <chris@basementcode.com>2010-06-04 13:48:15 -0400
committerChristopher Harvey <chris@basementcode.com>2010-06-04 13:48:15 -0400
commit0450d9358b08dd2c07288a9def2316b60452b2db (patch)
treea5b3348cd5d541f9a0c076f7ad7ee64266097f7c
parentAdded graphical apply button. Used to apply diffs once the user is happy with... (diff)
parentMarked broken places (diff)
downloadventoo-0450d9358b08dd2c07288a9def2316b60452b2db.tar.gz
ventoo-0450d9358b08dd2c07288a9def2316b60452b2db.tar.bz2
ventoo-0450d9358b08dd2c07288a9def2316b60452b2db.zip
Merge remote branch 'laptop/fixWalk' into work
-rw-r--r--src/frontend/main.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/frontend/main.py b/src/frontend/main.py
index 3131ec2..85348f2 100644
--- a/src/frontend/main.py
+++ b/src/frontend/main.py
@@ -283,6 +283,7 @@ class MainWindow(gtk.Window):
childMult = self.currentModule.getMultOf(osp.join(xmlRoot, child.tag))
matches = self.a.match(osp.join(augeasFileRoot, child.tag))
matches.extend(self.a.match(osp.join(augeasFileRoot, child.tag)+'[*]'))
+ #TODO: remove duplicates
listedNodes.extend(matches)
#add leaves if we're missing some required ones (in augeas itself)
@@ -298,7 +299,7 @@ class MainWindow(gtk.Window):
#update the matches, since we have added stuff to augeas, based on previous matches
matches = self.a.match(osp.join(augeasFileRoot, child.tag))
matches.extend(self.a.match(osp.join(augeasFileRoot, child.tag)+'[*]'))
-
+ #TODO: remove duplicates.
for match in matches:
userData = self.a.get(match) #add all existing data
if userData == None: