]> git.ipfire.org Git - thirdparty/snapper.git/commitdiff
- work on dbus interface
authorArvin Schnell <aschnell@suse.de>
Fri, 17 Aug 2012 12:40:19 +0000 (14:40 +0200)
committerArvin Schnell <aschnell@suse.de>
Fri, 17 Aug 2012 12:40:19 +0000 (14:40 +0200)
snapper/Comparison.cc
snapper/Comparison.h

index 8c76dd64594aebc2a9d078c464d5c40720353701..93efc6c5e6d04fe242033dd3075e647a86302f62 100644 (file)
@@ -86,14 +86,21 @@ namespace snapper
 
 
     void
-    Comparison::create()
+    Comparison::mount()
     {
-       y2mil("num1:" << getSnapshot1()->getNum() << " num2:" << getSnapshot2()->getNum());
-
        if (!getSnapshot1()->isCurrent())
            getSnapshot1()->mountFilesystemSnapshot();
        if (!getSnapshot2()->isCurrent())
            getSnapshot2()->mountFilesystemSnapshot();
+    }
+
+
+    void
+    Comparison::create()
+    {
+       y2mil("num1:" << getSnapshot1()->getNum() << " num2:" << getSnapshot2()->getNum());
+
+       mount();
 
 #if 1
        cmpdirs_cb_t cb = AppendHelper(&file_paths, files);
@@ -166,7 +173,7 @@ namespace snapper
     }
 
 
-    bool
+    void
     Comparison::save()
     {
        y2mil("num1:" << getSnapshot1()->getNum() << " num2:" << getSnapshot2()->getNum());
@@ -207,8 +214,6 @@ namespace snapper
        fclose(file);
 
        rename(tmp_name.c_str(), output.c_str());
-
-       return true;
     }
 
 
index dea824ad5b6f45ac73ea18ad80141075bbdd156f..9700be09a4f800448d965f63e926ad5000568e8d 100644 (file)
@@ -47,6 +47,8 @@ namespace snapper
        Files& getFiles() { return files; }
        const Files& getFiles() const { return files; }
 
+       void mount();
+
        UndoStatistic getUndoStatistic() const;
 
        vector<UndoStep> getUndoSteps() const;
@@ -58,7 +60,7 @@ namespace snapper
        void initialize();
        void create();
        bool load();
-       bool save();
+       void save();
        void filter();
 
        const Snapper* snapper;