- handle description also for post snapshots during create

diff --git a/snapper/Snapper.cc b/snapper/Snapper.cc
index 7effe41cdf08bee5208cfab8a53db42ddf7daed8..0425f2a3e1b631a5c9aa8e996e875e00c9191930 100644 (file)
--- a/snapper/Snapper.cc
+++ b/snapper/Snapper.cc
@@ -154,9 +154,9 @@ namespace snapper
 
 
     Snapshots::iterator
-    Snapper::createPostSnapshot(Snapshots::const_iterator pre)
+    Snapper::createPostSnapshot(string description, Snapshots::const_iterator pre)
     {
-       return snapshots.createPostSnapshot(pre);
+       return snapshots.createPostSnapshot(description, pre);
     }
 
 

diff --git a/snapper/Snapper.h b/snapper/Snapper.h
index 91a44d4f00c86f340567d54fe2b68e3450675558..86aae1e3796d73ea6b45a3ee0e65adb84efd053a 100644 (file)
--- a/snapper/Snapper.h
+++ b/snapper/Snapper.h
@@ -127,7 +127,7 @@ namespace snapper
 
        Snapshots::iterator createSingleSnapshot(string description);
        Snapshots::iterator createPreSnapshot(string description);
-       Snapshots::iterator createPostSnapshot(Snapshots::const_iterator pre);
+       Snapshots::iterator createPostSnapshot(string description, Snapshots::const_iterator pre);
 
        void deleteSnapshot(Snapshots::iterator snapshot);
 

diff --git a/snapper/Snapshot.cc b/snapper/Snapshot.cc
index c09f387640726130d63261d2d73f96b00b2c21a1..85af4b4d98d64325ca73fa734dd89539003a2381 100644 (file)
--- a/snapper/Snapshot.cc
+++ b/snapper/Snapshot.cc
@@ -460,12 +460,13 @@ namespace snapper
 
 
     Snapshots::iterator
-    Snapshots::createPostSnapshot(Snapshots::const_iterator pre)
+    Snapshots::createPostSnapshot(string description, Snapshots::const_iterator pre)
     {
        if (pre == entries.end() || pre->isCurrent() || pre->getType() != PRE)
            throw IllegalSnapshotException();
 
        Snapshot snapshot(snapper, POST, nextNumber(), time(NULL));
+       snapshot.description = description;
        snapshot.pre_num = pre->getNum();
        snapshot.info_modified = true;
 

diff --git a/snapper/Snapshot.h b/snapper/Snapshot.h
index 769c0bdc49ea598f1c8ef22bb16a6e22ca35fea1..8e083fd8764fbbd4173508ab8486b870482854a5 100644 (file)
--- a/snapper/Snapshot.h
+++ b/snapper/Snapshot.h
@@ -190,7 +190,7 @@ namespace snapper
 
        iterator createSingleSnapshot(string description);
        iterator createPreSnapshot(string description);
-       iterator createPostSnapshot(const_iterator pre);
+       iterator createPostSnapshot(string description, const_iterator pre);
 
        iterator createHelper(Snapshot& snapshot);
 

diff --git a/testsuite-real/common.cc b/testsuite-real/common.cc
index e3da091611a4df45179bcdc3b8acd860ca6bfc09..49d1354047d3bcaa9cc18e979de578fc90794ff4 100644 (file)
--- a/testsuite-real/common.cc
+++ b/testsuite-real/common.cc
@@ -83,7 +83,7 @@ first_snapshot()
 void
 second_snapshot()
 {
-    second = sh->createPostSnapshot(first);
+    second = sh->createPostSnapshot("testsuite", first);
     second->setCleanup("number");
 }
 

diff --git a/tools/snapper.cc b/tools/snapper.cc
index 9a1ff78c28e5440e6ecf7a8af135862d42f436d5..23bfb4319a2eccb7c0e12e9d16fc0eb280f7ead4 100644 (file)
--- a/tools/snapper.cc
+++ b/tools/snapper.cc
@@ -520,7 +520,7 @@ command_create()
            } break;
 
            case POST: {
-               Snapshots::iterator snap2 = sh->createPostSnapshot(snap1);
+               Snapshots::iterator snap2 = sh->createPostSnapshot(description, snap1);
                snap2->setCleanup(cleanup);
                snap2->setUserdata(userdata);
                snap2->flushInfo();