aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/ventoo/main.py')
-rw-r--r--src/ventoo/main.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/ventoo/main.py b/src/ventoo/main.py
index 84fe695..af22595 100644
--- a/src/ventoo/main.py
+++ b/src/ventoo/main.py
@@ -97,7 +97,7 @@ class MainWindow(gtk.Window):
model = editWidget.get_model()
thisIter = model.get_iter_from_string(path)
enabled = model.get_value(thisIter, 0)
- aug_root = a.get("/augeas/root")
+ aug_root = self.a.get("/augeas/root")
if not aug_root == '/':
augPath = osp.join('files', osp.relpath(self.currentConfigFilePath, aug_root), self.edit_tv.get_label_path(thisIter))
else:
@@ -158,7 +158,7 @@ class MainWindow(gtk.Window):
model = editWidget.get_model()
thisIter = model.get_iter_from_string(path)
enabled = model.get_value(thisIter, 0)
- aug_root = a.get("/augeas/root")
+ aug_root = self.a.get("/augeas/root")
#given a iter that was edited, and a current file, build the augeas path to the edited value.
if not aug_root == "/":
augPath = osp.join('files', osp.relpath(self.currentConfigFilePath, aug_root), self.edit_tv.get_label_path(thisIter))
@@ -227,7 +227,7 @@ class MainWindow(gtk.Window):
def refreshAugeasFileList(self):
#reload the file selection list from augeas internals.
self.files_tv.clearFiles()
- fileList = augeas_utils.accumulateFiles(a)
+ fileList = augeas_utils.accumulateFiles(self.a)
for f in fileList:
self.files_tv.addPath(f)
@@ -397,9 +397,7 @@ class MainWindow(gtk.Window):
#update the display...and get new module info.
#thse path manipulations are sketchy, should make this code clearer.
tmp = self.currentConfigFilePath
- if sandboxDir != '/':
- tmp = osp.relpath(self.currentConfigFilePath, sandboxDir)
- self.currentModule = VentooModule.VentooModule(augeas_utils.getVentooModuleNameFromSysPath(a, tmp))
+ self.currentModule = VentooModule.VentooModule(augeas_utils.getVentooModuleNameFromSysPath(self.a, osp.join('/', tmp)))
self.refreshAugeasEditTree()
def hideApplyDiffButton(self):