aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Harvey <chris@basementcode.com>2010-06-10 12:05:31 -0400
committerChristopher Harvey <chris@basementcode.com>2010-06-10 12:05:31 -0400
commit9fa39542cdce1165de13c972ef54555266cdf744 (patch)
tree458e65cb891acd4b4db3a320cf26d86622b60928
parentRemoved duplicates that sometimes appeard in the tree. (diff)
downloadventoo-9fa39542cdce1165de13c972ef54555266cdf744.tar.gz
ventoo-9fa39542cdce1165de13c972ef54555266cdf744.tar.bz2
ventoo-9fa39542cdce1165de13c972ef54555266cdf744.zip
Apply button merges changes.
-rw-r--r--src/frontend/main.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/frontend/main.py b/src/frontend/main.py
index 2c1e63a..1f1102e 100644
--- a/src/frontend/main.py
+++ b/src/frontend/main.py
@@ -193,7 +193,9 @@ class MainWindow(gtk.Window):
self.showApplyDiffButton()
def applyDiffPressed(self, button, data=None):
- pass
+ diffFiles = [self.currentConfigFilePath, augeas_utils.getDiffLocation(self.a, self.currentConfigFilePath)]
+ #merge diffFiles[0] <- diffFiles[1]
+ shutil.copyfile(diffFiles[1], diffFiles[0])
def showRCUpdate(self, button, data=None):
win = RcUpdateWindow.RcUpdateWindow()