From: Arvin Schnell <aschnell@suse.de>
Date: Thu, 29 Sep 2011 09:24:06 +0000 (+0200)
Subject: - handle description also for post snapshots during create
X-Git-Tag: v0.1.3~279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c31ee1077d9d12777770206f2a2bd838ee2a27c;p=thirdparty%2Fsnapper.git

- handle description also for post snapshots during create
---

diff --git a/snapper/Snapper.cc b/snapper/Snapper.cc
index 7effe41c..0425f2a3 100644
--- 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 91a44d4f..86aae1e3 100644
--- 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 c09f3876..85af4b4d 100644
--- 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 769c0bdc..8e083fd8 100644
--- 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 e3da0916..49d13540 100644
--- 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 9a1ff78c..23bfb431 100644
--- 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();