Hello community,
here is the log from the commit of package snapper for openSUSE:Factory checked
in at 2013-10-14 13:06:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/snapper (Old)
and /work/SRC/openSUSE:Factory/.snapper.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snapper"
Changes:
--------
--- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2013-10-04
16:01:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2013-10-14
13:06:50.000000000 +0200
@@ -4,0 +5 @@
+- 0.1.7
Old:
----
snapper-0.1.6.tar.bz2
New:
----
snapper-0.1.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ snapper.spec ++++++
--- /var/tmp/diff_new_pack.bTFtlA/_old 2013-10-14 13:06:51.000000000 +0200
+++ /var/tmp/diff_new_pack.bTFtlA/_new 2013-10-14 13:06:51.000000000 +0200
@@ -17,7 +17,7 @@
Name: snapper
-Version: 0.1.6
+Version: 0.1.7
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: snapper-%{version}.tar.bz2
++++++ snapper-0.1.6.tar.bz2 -> snapper-0.1.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/LIBVERSION new/snapper-0.1.7/LIBVERSION
--- old/snapper-0.1.6/LIBVERSION 2013-07-25 14:44:29.000000000 +0200
+++ new/snapper-0.1.7/LIBVERSION 2013-10-09 09:28:53.000000000 +0200
@@ -1 +1 @@
-2.1.0
+2.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/VERSION new/snapper-0.1.7/VERSION
--- old/snapper-0.1.6/VERSION 2013-09-06 16:49:46.000000000 +0200
+++ new/snapper-0.1.7/VERSION 2013-10-08 13:10:11.000000000 +0200
@@ -1 +1 @@
-0.1.6
+0.1.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/client/Makefile.in
new/snapper-0.1.7/client/Makefile.in
--- old/snapper-0.1.6/client/Makefile.in 2013-09-30 14:19:37.000000000
+0200
+++ new/snapper-0.1.7/client/Makefile.in 2013-10-09 13:48:08.000000000
+0200
@@ -330,9 +330,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign client/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign client/Makefile
+ $(AUTOMAKE) --gnu client/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/client/utils/Makefile.in
new/snapper-0.1.7/client/utils/Makefile.in
--- old/snapper-0.1.6/client/utils/Makefile.in 2013-09-30 14:19:37.000000000
+0200
+++ new/snapper-0.1.7/client/utils/Makefile.in 2013-10-09 13:48:08.000000000
+0200
@@ -287,9 +287,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
client/utils/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/utils/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign client/utils/Makefile
+ $(AUTOMAKE) --gnu client/utils/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/data/Makefile.in
new/snapper-0.1.7/data/Makefile.in
--- old/snapper-0.1.6/data/Makefile.in 2013-09-30 14:19:37.000000000 +0200
+++ new/snapper-0.1.7/data/Makefile.in 2013-10-09 13:48:08.000000000 +0200
@@ -234,9 +234,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign data/Makefile
+ $(AUTOMAKE) --gnu data/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/dbus/Makefile.in
new/snapper-0.1.7/dbus/Makefile.in
--- old/snapper-0.1.6/dbus/Makefile.in 2013-09-30 14:19:37.000000000 +0200
+++ new/snapper-0.1.7/dbus/Makefile.in 2013-10-09 13:48:08.000000000 +0200
@@ -289,9 +289,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dbus/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dbus/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign dbus/Makefile
+ $(AUTOMAKE) --gnu dbus/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/doc/Makefile.in
new/snapper-0.1.7/doc/Makefile.in
--- old/snapper-0.1.6/doc/Makefile.in 2013-09-30 14:19:37.000000000 +0200
+++ new/snapper-0.1.7/doc/Makefile.in 2013-10-09 13:48:09.000000000 +0200
@@ -270,9 +270,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign doc/Makefile
+ $(AUTOMAKE) --gnu doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/examples/Makefile.in
new/snapper-0.1.7/examples/Makefile.in
--- old/snapper-0.1.6/examples/Makefile.in 2013-09-30 14:19:37.000000000
+0200
+++ new/snapper-0.1.7/examples/Makefile.in 2013-10-09 13:48:09.000000000
+0200
@@ -272,9 +272,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign examples/Makefile
+ $(AUTOMAKE) --gnu examples/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/examples/c/Makefile.in
new/snapper-0.1.7/examples/c/Makefile.in
--- old/snapper-0.1.6/examples/c/Makefile.in 2013-09-30 14:19:38.000000000
+0200
+++ new/snapper-0.1.7/examples/c/Makefile.in 2013-10-09 13:48:09.000000000
+0200
@@ -272,9 +272,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/c/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/c/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign examples/c/Makefile
+ $(AUTOMAKE) --gnu examples/c/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/examples/c++-lib/Makefile.in
new/snapper-0.1.7/examples/c++-lib/Makefile.in
--- old/snapper-0.1.6/examples/c++-lib/Makefile.in 2013-09-30
14:19:37.000000000 +0200
+++ new/snapper-0.1.7/examples/c++-lib/Makefile.in 2013-10-09
13:48:09.000000000 +0200
@@ -298,9 +298,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
examples/c++-lib/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu
examples/c++-lib/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign examples/c++-lib/Makefile
+ $(AUTOMAKE) --gnu examples/c++-lib/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/pam/Makefile.in
new/snapper-0.1.7/pam/Makefile.in
--- old/snapper-0.1.6/pam/Makefile.in 2013-09-30 14:19:38.000000000 +0200
+++ new/snapper-0.1.7/pam/Makefile.in 2013-10-09 13:48:09.000000000 +0200
@@ -303,9 +303,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign pam/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pam/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign pam/Makefile
+ $(AUTOMAKE) --gnu pam/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/po/Makefile.in
new/snapper-0.1.7/po/Makefile.in
--- old/snapper-0.1.6/po/Makefile.in 2013-09-30 14:19:38.000000000 +0200
+++ new/snapper-0.1.7/po/Makefile.in 2013-10-09 13:48:09.000000000 +0200
@@ -239,9 +239,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign po/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu po/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign po/Makefile
+ $(AUTOMAKE) --gnu po/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/scripts/Makefile.in
new/snapper-0.1.7/scripts/Makefile.in
--- old/snapper-0.1.6/scripts/Makefile.in 2013-09-30 14:19:38.000000000
+0200
+++ new/snapper-0.1.7/scripts/Makefile.in 2013-10-09 13:48:09.000000000
+0200
@@ -269,9 +269,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign scripts/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign scripts/Makefile
+ $(AUTOMAKE) --gnu scripts/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/scripts/zypp-plugin.py
new/snapper-0.1.7/scripts/zypp-plugin.py
--- old/snapper-0.1.6/scripts/zypp-plugin.py 2013-09-10 17:26:42.000000000
+0200
+++ new/snapper-0.1.7/scripts/zypp-plugin.py 2013-10-08 13:22:32.000000000
+0200
@@ -6,8 +6,10 @@
from dbus import SystemBus, Interface
from zypp_plugin import Plugin
+
class MyPlugin(Plugin):
+
def parse_userdata(self, s):
ud = {}
for kv in s.split(","):
@@ -18,29 +20,32 @@
ud[k] = v.strip()
return ud
+
def PLUGINBEGIN(self, headers, body):
exe = basename(readlink("/proc/%d/exe" % getppid()))
- userdata = {}
+ self.userdata = {}
try:
- userdata = self.parse_userdata(headers['userdata'])
+ self.userdata = self.parse_userdata(headers['userdata'])
except KeyError:
pass
except ValueError:
stderr.write("invalid userdata")
- self.num1 = snapper.CreatePreSnapshot("root", "zypp(%s)" % exe, "number",
userdata)
+ self.num1 = snapper.CreatePreSnapshot("root", "zypp(%s)" % exe, "number",
self.userdata)
self.ack()
+
def PLUGINEND(self, headers, body):
- self.num2 = snapper.CreatePostSnapshot("root", self.num1, "", "number", {})
+ self.num2 = snapper.CreatePostSnapshot("root", self.num1, "", "number",
self.userdata)
self.ack()
+
bus = SystemBus()
snapper = Interface(bus.get_object('org.opensuse.Snapper',
'/org/opensuse/Snapper'),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/server/Client.cc
new/snapper-0.1.7/server/Client.cc
--- old/snapper-0.1.6/server/Client.cc 2013-09-02 21:42:06.000000000 +0200
+++ new/snapper-0.1.7/server/Client.cc 2013-10-08 17:05:19.000000000 +0200
@@ -810,10 +810,7 @@
if (snap == snapshots.end())
throw IllegalSnapshotException();
- snap->setDescription(description);
- snap->setCleanup(cleanup);
- snap->setUserdata(userdata);
- snap->flushInfo();
+ snapper->modifySnapshot(snap, description, cleanup, userdata);
DBus::MessageMethodReturn reply(msg);
@@ -845,11 +842,8 @@
Snapper* snapper = it->getSnapper();
- Snapshots::iterator snap1 = snapper->createSingleSnapshot(description);
- snap1->setUid(conn.get_unix_userid(msg));
- snap1->setCleanup(cleanup);
- snap1->setUserdata(userdata);
- snap1->flushInfo();
+ Snapshots::iterator snap1 =
snapper->createSingleSnapshot(conn.get_unix_userid(msg),
+ description,
cleanup, userdata);
DBus::MessageMethodReturn reply(msg);
@@ -884,11 +878,8 @@
Snapper* snapper = it->getSnapper();
- Snapshots::iterator snap1 = snapper->createPreSnapshot(description);
- snap1->setUid(conn.get_unix_userid(msg));
- snap1->setCleanup(cleanup);
- snap1->setUserdata(userdata);
- snap1->flushInfo();
+ Snapshots::iterator snap1 =
snapper->createPreSnapshot(conn.get_unix_userid(msg), description,
+ cleanup, userdata);
DBus::MessageMethodReturn reply(msg);
@@ -927,11 +918,8 @@
Snapshots::iterator snap1 = snapshots.find(pre_num);
- Snapshots::iterator snap2 = snapper->createPostSnapshot(description,
snap1);
- snap2->setUid(conn.get_unix_userid(msg));
- snap2->setCleanup(cleanup);
- snap2->setUserdata(userdata);
- snap2->flushInfo();
+ Snapshots::iterator snap2 = snapper->createPostSnapshot(snap1,
conn.get_unix_userid(msg),
+ description,
cleanup, userdata);
bool tmp;
if (it->getConfigInfo().getValue("BACKGROUND_COMPARISON", tmp) && tmp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/server/Makefile.in
new/snapper-0.1.7/server/Makefile.in
--- old/snapper-0.1.6/server/Makefile.in 2013-09-30 14:19:38.000000000
+0200
+++ new/snapper-0.1.7/server/Makefile.in 2013-10-09 13:48:09.000000000
+0200
@@ -291,9 +291,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign server/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu server/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign server/Makefile
+ $(AUTOMAKE) --gnu server/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/snapper/Makefile.in
new/snapper-0.1.7/snapper/Makefile.in
--- old/snapper-0.1.6/snapper/Makefile.in 2013-10-01 16:46:57.000000000
+0200
+++ new/snapper-0.1.7/snapper/Makefile.in 2013-10-09 13:48:09.000000000
+0200
@@ -367,9 +367,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign snapper/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu snapper/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign snapper/Makefile
+ $(AUTOMAKE) --gnu snapper/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/snapper/Snapper.cc
new/snapper-0.1.7/snapper/Snapper.cc
--- old/snapper-0.1.6/snapper/Snapper.cc 2013-10-02 12:01:33.000000000
+0200
+++ new/snapper-0.1.7/snapper/Snapper.cc 2013-10-08 18:13:51.000000000
+0200
@@ -180,21 +180,54 @@
Snapshots::iterator
Snapper::createSingleSnapshot(string description)
{
- return snapshots.createSingleSnapshot(description);
+ return snapshots.createSingleSnapshot(0, description, "", map<string,
string>());
}
Snapshots::iterator
Snapper::createPreSnapshot(string description)
{
- return snapshots.createPreSnapshot(description);
+ return snapshots.createPreSnapshot(0, description, "", map<string,
string>());
}
Snapshots::iterator
Snapper::createPostSnapshot(string description, Snapshots::const_iterator
pre)
{
- return snapshots.createPostSnapshot(description, pre);
+ return snapshots.createPostSnapshot(pre, 0, description, "",
map<string, string>());
+ }
+
+
+ Snapshots::iterator
+ Snapper::createSingleSnapshot(uid_t uid, const string& description, const
string& cleanup,
+ const map<string, string>& userdata)
+ {
+ return snapshots.createSingleSnapshot(uid, description, cleanup,
userdata);
+ }
+
+
+
+ Snapshots::iterator
+ Snapper::createPreSnapshot(uid_t uid, const string& description, const
string& cleanup,
+ const map<string, string>& userdata)
+ {
+ return snapshots.createPreSnapshot(uid, description, cleanup, userdata);
+ }
+
+
+ Snapshots::iterator
+ Snapper::createPostSnapshot(Snapshots::const_iterator pre, uid_t uid,
const string& description,
+ const string& cleanup, const map<string,
string>& userdata)
+ {
+ return snapshots.createPostSnapshot(pre, uid, description, cleanup,
userdata);
+ }
+
+
+ void
+ Snapper::modifySnapshot(Snapshots::iterator snapshot, const string&
description,
+ const string& cleanup, const map<string, string>&
userdata)
+ {
+ snapshots.modifySnapshot(snapshot, description, cleanup, userdata);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/snapper/Snapper.h
new/snapper-0.1.7/snapper/Snapper.h
--- old/snapper-0.1.6/snapper/Snapper.h 2013-10-02 11:19:00.000000000 +0200
+++ new/snapper-0.1.7/snapper/Snapper.h 2013-10-08 17:05:19.000000000 +0200
@@ -125,9 +125,22 @@
Snapshots::const_iterator getSnapshotCurrent() const;
- Snapshots::iterator createSingleSnapshot(string description);
- Snapshots::iterator createPreSnapshot(string description);
- Snapshots::iterator createPostSnapshot(string description,
Snapshots::const_iterator pre);
+ Snapshots::iterator createSingleSnapshot(string description)
__attribute__ ((deprecated));
+ Snapshots::iterator createPreSnapshot(string description) __attribute__
((deprecated));
+ Snapshots::iterator createPostSnapshot(string description,
Snapshots::const_iterator pre) __attribute__ ((deprecated));
+
+ Snapshots::iterator createSingleSnapshot(uid_t uid, const string&
description,
+ const string& cleanup,
+ const map<string, string>&
userdata);
+ Snapshots::iterator createPreSnapshot(uid_t uid, const string&
description,
+ const string& cleanup,
+ const map<string, string>&
userdata);
+ Snapshots::iterator createPostSnapshot(Snapshots::const_iterator pre,
uid_t uid,
+ const string& description, const
string& cleanup,
+ const map<string, string>&
userdata);
+
+ void modifySnapshot(Snapshots::iterator snapshot, const string&
description,
+ const string& cleanup, const map<string, string>&
userdata);
void deleteSnapshot(Snapshots::iterator snapshot);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/snapper/Snapshot.cc
new/snapper-0.1.7/snapper/Snapshot.cc
--- old/snapper-0.1.6/snapper/Snapshot.cc 2013-04-02 10:11:02.000000000
+0200
+++ new/snapper-0.1.7/snapper/Snapshot.cc 2013-10-09 13:47:26.000000000
+0200
@@ -316,6 +316,20 @@
void
+ Snapshots::checkUserdata(const map<string, string>& userdata) const
+ {
+ for (map<string, string>::const_iterator it = userdata.begin(); it !=
userdata.end(); ++it)
+ {
+ if (it->first.empty() || it->first.find_first_of(",=") !=
string::npos)
+ throw InvalidUserdataException();
+
+ if (it->second.find_first_of(",=") != string::npos)
+ throw InvalidUserdataException();
+ }
+ }
+
+
+ void
Snapshots::initialize()
{
entries.clear();
@@ -555,36 +569,72 @@
Snapshots::iterator
Snapshots::createSingleSnapshot(string description)
{
+ return createSingleSnapshot(0, description, "", map<string, string>());
+ }
+
+
+ Snapshots::iterator
+ Snapshots::createPreSnapshot(string description)
+ {
+ return createPreSnapshot(0, description, "", map<string, string>());
+ }
+
+
+ Snapshots::iterator
+ Snapshots::createPostSnapshot(string description,
Snapshots::const_iterator pre)
+ {
+ return createPostSnapshot(pre, 0, description, "", map<string,
string>());
+ }
+
+
+ Snapshots::iterator
+ Snapshots::createSingleSnapshot(uid_t uid, const string& description,
const string& cleanup,
+ const map<string, string>& userdata)
+ {
+ checkUserdata(userdata);
+
Snapshot snapshot(snapper, SINGLE, nextNumber(), time(NULL));
+ snapshot.uid = uid;
snapshot.description = description;
- snapshot.info_modified = true;
+ snapshot.cleanup = cleanup;
+ snapshot.userdata = userdata;
return createHelper(snapshot);
}
Snapshots::iterator
- Snapshots::createPreSnapshot(string description)
+ Snapshots::createPreSnapshot(uid_t uid, const string& description, const
string& cleanup,
+ const map<string, string>& userdata)
{
+ checkUserdata(userdata);
+
Snapshot snapshot(snapper, PRE, nextNumber(), time(NULL));
+ snapshot.uid = uid;
snapshot.description = description;
- snapshot.info_modified = true;
+ snapshot.cleanup = cleanup;
+ snapshot.userdata = userdata;
return createHelper(snapshot);
}
Snapshots::iterator
- Snapshots::createPostSnapshot(string description,
Snapshots::const_iterator pre)
+ Snapshots::createPostSnapshot(Snapshots::const_iterator pre, uid_t uid,
const string& description,
+ const string& cleanup, const map<string,
string>& userdata)
{
if (pre == entries.end() || pre->isCurrent() || pre->getType() != PRE ||
findPost(pre) != entries.end())
throw IllegalSnapshotException();
+ checkUserdata(userdata);
+
Snapshot snapshot(snapper, POST, nextNumber(), time(NULL));
- snapshot.description = description;
snapshot.pre_num = pre->getNum();
- snapshot.info_modified = true;
+ snapshot.uid = uid;
+ snapshot.description = description;
+ snapshot.cleanup = cleanup;
+ snapshot.userdata = userdata;
return createHelper(snapshot);
}
@@ -606,7 +656,7 @@
try
{
- snapshot.flushInfo();
+ snapshot.writeInfo();
}
catch (const IOErrorException& e)
{
@@ -627,6 +677,23 @@
}
+ void
+ Snapshots::modifySnapshot(iterator snapshot, const string& description,
const string& cleanup,
+ const map<string, string>& userdata)
+ {
+ if (snapshot == entries.end() || snapshot->isCurrent())
+ throw IllegalSnapshotException();
+
+ checkUserdata(userdata);
+
+ snapshot->description = description;
+ snapshot->cleanup = cleanup;
+ snapshot->userdata = userdata;
+
+ snapshot->writeInfo();
+ }
+
+
void
Snapshots::deleteSnapshot(iterator snapshot)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/snapper/Snapshot.h
new/snapper-0.1.7/snapper/Snapshot.h
--- old/snapper-0.1.6/snapper/Snapshot.h 2013-09-10 16:06:58.000000000
+0200
+++ new/snapper-0.1.7/snapper/Snapshot.h 2013-10-08 18:08:38.000000000
+0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Novell, Inc.
+ * Copyright (c) [2011-2013] Novell, Inc.
*
* All Rights Reserved.
*
@@ -94,21 +94,21 @@
time_t getDate() const { return date; }
- void setUid(uid_t uid);
+ void setUid(uid_t uid) __attribute__ ((deprecated));
uid_t getUid() const { return uid; }
unsigned int getPreNum() const { return pre_num; }
- void setDescription(const string& description);
+ void setDescription(const string& description) __attribute__
((deprecated));
string getDescription() const { return description; }
- void setCleanup(const string& cleanup);
+ void setCleanup(const string& cleanup) __attribute__ ((deprecated));
string getCleanup() const { return cleanup; }
- void setUserdata(const map<string, string>& userdata);
+ void setUserdata(const map<string, string>& userdata) __attribute__
((deprecated));
map<string, string> getUserdata() const { return userdata; }
- void flushInfo();
+ void flushInfo() __attribute__ ((deprecated));
string snapshotDir() const;
@@ -200,12 +200,24 @@
void check() const;
- iterator createSingleSnapshot(string description);
- iterator createPreSnapshot(string description);
- iterator createPostSnapshot(string description, const_iterator pre);
+ void checkUserdata(const map<string, string>& userdata) const;
+
+ iterator createSingleSnapshot(string description) __attribute__
((deprecated));
+ iterator createPreSnapshot(string description) __attribute__
((deprecated));
+ iterator createPostSnapshot(string description, const_iterator pre)
__attribute__ ((deprecated));
+
+ iterator createSingleSnapshot(uid_t uid, const string& description,
const string& cleanup,
+ const map<string, string>& userdata);
+ iterator createPreSnapshot(uid_t uid, const string& description, const
string& cleanup,
+ const map<string, string>& userdata);
+ iterator createPostSnapshot(const_iterator pre, uid_t uid, const
string& description,
+ const string& cleanup, const map<string,
string>& userdata);
iterator createHelper(Snapshot& snapshot);
+ void modifySnapshot(iterator snapshot, const string& description, const
string& cleanup,
+ const map<string, string>& userdata);
+
void deleteSnapshot(iterator snapshot);
unsigned int nextNumber();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/snapper/Version.h
new/snapper-0.1.7/snapper/Version.h
--- old/snapper-0.1.6/snapper/Version.h 2013-10-02 10:46:43.000000000 +0200
+++ new/snapper-0.1.7/snapper/Version.h 2013-10-09 13:48:12.000000000 +0200
@@ -25,7 +25,7 @@
#define LIBSNAPPER_MAJOR="2"
-#define LIBSNAPPER_MINOR="1"
+#define LIBSNAPPER_MINOR="2"
#define LIBSNAPPER_PATCHLEVEL="0"
#define LIBSNAPPER_VERSION ( LIBSNAPPER_MAJOR * 10000 + \\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/testsuite/Makefile.in
new/snapper-0.1.7/testsuite/Makefile.in
--- old/snapper-0.1.6/testsuite/Makefile.in 2013-09-30 14:19:38.000000000
+0200
+++ new/snapper-0.1.7/testsuite/Makefile.in 2013-10-09 13:48:09.000000000
+0200
@@ -301,9 +301,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign testsuite/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign testsuite/Makefile
+ $(AUTOMAKE) --gnu testsuite/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/testsuite-cmp/Makefile.in
new/snapper-0.1.7/testsuite-cmp/Makefile.in
--- old/snapper-0.1.6/testsuite-cmp/Makefile.in 2013-09-30 14:19:38.000000000
+0200
+++ new/snapper-0.1.7/testsuite-cmp/Makefile.in 2013-10-09 13:48:09.000000000
+0200
@@ -272,9 +272,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
testsuite-cmp/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite-cmp/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign testsuite-cmp/Makefile
+ $(AUTOMAKE) --gnu testsuite-cmp/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/testsuite-real/Makefile.in
new/snapper-0.1.7/testsuite-real/Makefile.in
--- old/snapper-0.1.6/testsuite-real/Makefile.in 2013-09-30
14:19:38.000000000 +0200
+++ new/snapper-0.1.7/testsuite-real/Makefile.in 2013-10-09
13:48:09.000000000 +0200
@@ -374,9 +374,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign
testsuite-real/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite-real/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign testsuite-real/Makefile
+ $(AUTOMAKE) --gnu testsuite-real/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.1.6/testsuite-real/common.cc
new/snapper-0.1.7/testsuite-real/common.cc
--- old/snapper-0.1.6/testsuite-real/common.cc 2013-06-25 17:41:37.000000000
+0200
+++ new/snapper-0.1.7/testsuite-real/common.cc 2013-10-09 09:57:19.000000000
+0200
@@ -48,16 +48,14 @@
void
first_snapshot()
{
- first = sh->createPreSnapshot(CONFIG);
- first->setCleanup("number");
+ first = sh->createPreSnapshot(0, CONFIG, "number", map<string, string>());
}
void
second_snapshot()
{
- second = sh->createPostSnapshot(CONFIG, first);
- second->setCleanup("number");
+ second = sh->createPostSnapshot(first, 0, CONFIG, "number", map<string,
string>());
}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
