Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2015-03-09 09:59:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-02-22 17:25:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2015-03-09 09:59:41.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Mar 03 10:22:28 CET 2015 - aschn...@suse.de + +- allow to set userdata for snapshots created by helper programs + +------------------------------------------------------------------- +Mon Mar 02 17:30:06 CET 2015 - aschn...@suse.de + +- install systemd unit files and helper (see + gh#openSUSE/snapper#154) + +------------------------------------------------------------------- +Tue Feb 24 11:48:12 CET 2015 - aschn...@suse.de + +- drop -mt decoration from boost libraries (see + http://www.boost.org/users/history/version_1_40_0.html) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper.spec ++++++ --- /var/tmp/diff_new_pack.fhAR1I/_old 2015-03-09 09:59:42.000000000 +0100 +++ /var/tmp/diff_new_pack.fhAR1I/_new 2015-03-09 09:59:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package snapper # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -116,6 +116,7 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/snapper /etc/cron.hourly/suse.de-snapper /etc/cron.daily/suse.de-snapper +/usr/lib/systemd/system/snapper-*.* %config /etc/dbus-1/system.d/org.opensuse.Snapper.conf %{prefix}/share/dbus-1/system-services/org.opensuse.Snapper.service ++++++ snapper-0.2.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.6/client/Makefile.am new/snapper-0.2.6/client/Makefile.am --- old/snapper-0.2.6/client/Makefile.am 2015-02-18 18:54:03.000000000 +0100 +++ new/snapper-0.2.6/client/Makefile.am 2015-03-03 11:07:43.000000000 +0100 @@ -20,20 +20,20 @@ libexecdir = /usr/lib/snapper -libexec_PROGRAMS = installation-helper +libexec_PROGRAMS = installation-helper systemd-helper installation_helper_SOURCES = \ - installation-helper.cc + installation-helper.cc \ + misc.cc misc.h installation_helper_LDADD = ../snapper/libsnapper.la utils/libutils.la -noinst_PROGRAMS = systemd-helper - systemd_helper_SOURCES = \ systemd-helper.cc \ types.cc types.h \ commands.cc commands.h \ cleanup.cc cleanup.h \ + misc.cc misc.h \ errors.cc errors.h systemd_helper_LDADD = ../snapper/libsnapper.la utils/libutils.la ../dbus/libdbus.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.6/client/Makefile.in new/snapper-0.2.6/client/Makefile.in --- old/snapper-0.2.6/client/Makefile.in 2015-02-20 17:15:19.000000000 +0100 +++ new/snapper-0.2.6/client/Makefile.in 2015-03-03 11:07:53.000000000 +0100 @@ -83,8 +83,8 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = snapper$(EXEEXT) -libexec_PROGRAMS = installation-helper$(EXEEXT) -noinst_PROGRAMS = systemd-helper$(EXEEXT) +libexec_PROGRAMS = installation-helper$(EXEEXT) \ + systemd-helper$(EXEEXT) subdir = client DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp @@ -97,8 +97,9 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" -PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS) -am_installation_helper_OBJECTS = installation-helper.$(OBJEXT) +PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) +am_installation_helper_OBJECTS = installation-helper.$(OBJEXT) \ + misc.$(OBJEXT) installation_helper_OBJECTS = $(am_installation_helper_OBJECTS) installation_helper_DEPENDENCIES = ../snapper/libsnapper.la \ utils/libutils.la @@ -113,7 +114,8 @@ snapper_DEPENDENCIES = ../snapper/libsnapper.la utils/libutils.la \ ../dbus/libdbus.la am_systemd_helper_OBJECTS = systemd-helper.$(OBJEXT) types.$(OBJEXT) \ - commands.$(OBJEXT) cleanup.$(OBJEXT) errors.$(OBJEXT) + commands.$(OBJEXT) cleanup.$(OBJEXT) misc.$(OBJEXT) \ + errors.$(OBJEXT) systemd_helper_OBJECTS = $(am_systemd_helper_OBJECTS) systemd_helper_DEPENDENCIES = ../snapper/libsnapper.la \ utils/libutils.la ../dbus/libdbus.la @@ -394,7 +396,8 @@ snapper_LDADD = ../snapper/libsnapper.la utils/libutils.la ../dbus/libdbus.la installation_helper_SOURCES = \ - installation-helper.cc + installation-helper.cc \ + misc.cc misc.h installation_helper_LDADD = ../snapper/libsnapper.la utils/libutils.la systemd_helper_SOURCES = \ @@ -402,6 +405,7 @@ types.cc types.h \ commands.cc commands.h \ cleanup.cc cleanup.h \ + misc.cc misc.h \ errors.cc errors.h systemd_helper_LDADD = ../snapper/libsnapper.la utils/libutils.la ../dbus/libdbus.la @@ -538,15 +542,6 @@ echo " rm -f" $$list; \ rm -f $$list -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - installation-helper$(EXEEXT): $(installation_helper_OBJECTS) $(installation_helper_DEPENDENCIES) $(EXTRA_installation_helper_DEPENDENCIES) @rm -f installation-helper$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(installation_helper_OBJECTS) $(installation_helper_LDADD) $(LIBS) @@ -796,7 +791,7 @@ clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \ - clean-libtool clean-noinstPROGRAMS mostlyclean-am + clean-libtool mostlyclean-am distclean: distclean-recursive -rm -rf ./$(DEPDIR) @@ -868,16 +863,16 @@ .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ check-am clean clean-binPROGRAMS clean-generic \ - clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ + clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecPROGRAMS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.6/client/installation-helper.cc new/snapper-0.2.6/client/installation-helper.cc --- old/snapper-0.2.6/client/installation-helper.cc 2015-02-20 17:15:11.000000000 +0100 +++ new/snapper-0.2.6/client/installation-helper.cc 2015-03-03 11:07:43.000000000 +0100 @@ -39,13 +39,15 @@ #include "utils/GetOpts.h" +#include "misc.h" + using namespace snapper; using namespace std; void -step1(const string& device, const string& description) +step1(const string& device, const string& description, const map<string, string>& userdata) { // step runs in inst-sys @@ -94,6 +96,7 @@ SCD scd; scd.read_only = false; scd.description = description; + scd.userdata = userdata; Snapshots::iterator snapshot = snapper.createSingleSnapshot(scd); @@ -222,6 +225,7 @@ { "root-prefix", required_argument, 0, 0 }, { "default-subvolume-name", required_argument, 0, 0 }, { "description", required_argument, 0, 0 }, + { "userdata", required_argument, 0, 'u' }, { 0, 0, 0, 0 } }; @@ -230,6 +234,7 @@ string root_prefix = "/"; string default_subvolume_name; string description; + map<string, string> userdata; GetOpts getopts; @@ -254,8 +259,11 @@ if ((opt = opts.find("description")) != opts.end()) description = opt->second; + if ((opt = opts.find("userdata")) != opts.end()) + userdata = read_userdata(opt->second); + if (step == "1") - step1(device, description); + step1(device, description, userdata); else if (step == "2") step2(device, root_prefix, default_subvolume_name); else if (step == "3") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.6/client/systemd-helper.cc new/snapper-0.2.6/client/systemd-helper.cc --- old/snapper-0.2.6/client/systemd-helper.cc 2014-03-06 17:44:45.000000000 +0100 +++ new/snapper-0.2.6/client/systemd-helper.cc 2015-03-03 11:07:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Novell, Inc. + * Copyright (c) [2014-2015] Novell, Inc. * * All Rights Reserved. * @@ -31,20 +31,19 @@ #include "commands.h" #include "cleanup.h" #include "errors.h" +#include "misc.h" using namespace snapper; using namespace std; -GetOpts getopts; - bool do_timeline = false; bool do_cleanup = false; void -timeline(DBus::Connection* conn) +timeline(DBus::Connection* conn, const map<string, string>& userdata) { list<XConfigInfo> config_infos = command_list_xconfigs(*conn); for (const XConfigInfo& config_info : config_infos) @@ -53,7 +52,7 @@ if (pos1 != config_info.raw.end() && pos1->second == "yes") { command_create_single_xsnapshot(*conn, config_info.config_name, "timeline", - "timeline", map<string, string>()); + "timeline", userdata); } } } @@ -94,25 +93,35 @@ const struct option options[] = { { "timeline", no_argument, 0, 0 }, { "cleanup", no_argument, 0, 0 }, + { "userdata", required_argument, 0, 'u' }, { 0, 0, 0, 0 } }; + map<string, string> userdata; + + GetOpts getopts; + getopts.init(argc, argv); GetOpts::parsed_opts opts = getopts.parse(options); + GetOpts::parsed_opts::const_iterator opt; + if (opts.find("timeline") != opts.end()) do_timeline = true; if (opts.find("cleanup") != opts.end()) do_cleanup = true; + if ((opt = opts.find("userdata")) != opts.end()) + userdata = read_userdata(opt->second); + try { DBus::Connection conn(DBUS_BUS_SYSTEM); if (do_timeline) - timeline(&conn); + timeline(&conn, userdata); if (do_cleanup) cleanup(&conn); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.6/data/Makefile.am new/snapper-0.2.6/data/Makefile.am --- old/snapper-0.2.6/data/Makefile.am 2014-12-31 13:14:14.000000000 +0100 +++ new/snapper-0.2.6/data/Makefile.am 2015-03-02 17:53:16.000000000 +0100 @@ -4,19 +4,29 @@ EXTRA_DIST = sysconfig.snapper base.txt lvm.txt x11.txt snapper.logrotate \ default-config org.opensuse.Snapper.conf org.opensuse.Snapper.service \ - zypp-plugin.conf cleanup.service cleanup.timer timeline.service timeline.timer + zypp-plugin.conf timeline.service timeline.timer cleanup.service \ + cleanup.timer install-data-local: install -D -m 644 snapper.logrotate $(DESTDIR)/etc/logrotate.d/snapper + install -d -m 755 $(DESTDIR)/etc/snapper/configs install -D -m 644 default-config $(DESTDIR)/etc/snapper/config-templates/default + install -d -m 755 $(DESTDIR)/etc/snapper/filters install -D -m 644 base.txt $(DESTDIR)/etc/snapper/filters/base.txt install -D -m 644 lvm.txt $(DESTDIR)/etc/snapper/filters/lvm.txt install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt + install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.Snapper.conf install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service + install -D -m 644 timeline.service $(DESTDIR)/usr/lib/systemd/system/snapper-timeline.service + install -D -m 644 timeline.timer $(DESTDIR)/usr/lib/systemd/system/snapper-timeline.timer + install -D -m 644 cleanup.service $(DESTDIR)/usr/lib/systemd/system/snapper-cleanup.service + install -D -m 644 cleanup.timer $(DESTDIR)/usr/lib/systemd/system/snapper-cleanup.timer + if HAVE_ZYPP install -D -m 644 zypp-plugin.conf $(DESTDIR)/etc/snapper/zypp-plugin.conf endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.6/data/Makefile.in new/snapper-0.2.6/data/Makefile.in --- old/snapper-0.2.6/data/Makefile.in 2015-02-20 17:15:19.000000000 +0100 +++ new/snapper-0.2.6/data/Makefile.in 2015-03-03 11:07:53.000000000 +0100 @@ -256,7 +256,8 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = sysconfig.snapper base.txt lvm.txt x11.txt snapper.logrotate \ default-config org.opensuse.Snapper.conf org.opensuse.Snapper.service \ - zypp-plugin.conf cleanup.service cleanup.timer timeline.service timeline.timer + zypp-plugin.conf timeline.service timeline.timer cleanup.service \ + cleanup.timer all: all-am @@ -452,15 +453,23 @@ install-data-local: install -D -m 644 snapper.logrotate $(DESTDIR)/etc/logrotate.d/snapper + install -d -m 755 $(DESTDIR)/etc/snapper/configs install -D -m 644 default-config $(DESTDIR)/etc/snapper/config-templates/default + install -d -m 755 $(DESTDIR)/etc/snapper/filters install -D -m 644 base.txt $(DESTDIR)/etc/snapper/filters/base.txt install -D -m 644 lvm.txt $(DESTDIR)/etc/snapper/filters/lvm.txt install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt + install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.Snapper.conf install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service + install -D -m 644 timeline.service $(DESTDIR)/usr/lib/systemd/system/snapper-timeline.service + install -D -m 644 timeline.timer $(DESTDIR)/usr/lib/systemd/system/snapper-timeline.timer + install -D -m 644 cleanup.service $(DESTDIR)/usr/lib/systemd/system/snapper-cleanup.service + install -D -m 644 cleanup.timer $(DESTDIR)/usr/lib/systemd/system/snapper-cleanup.timer + @HAVE_ZYPP_TRUE@ install -D -m 644 zypp-plugin.conf $(DESTDIR)/etc/snapper/zypp-plugin.conf # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.6/scripts/Makefile.am new/snapper-0.2.6/scripts/Makefile.am --- old/snapper-0.2.6/scripts/Makefile.am 2014-01-29 16:48:30.000000000 +0100 +++ new/snapper-0.2.6/scripts/Makefile.am 2015-03-02 17:53:16.000000000 +0100 @@ -19,6 +19,7 @@ install-data-local: install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/suse.de-snapper install -D snapper-daily $(DESTDIR)/etc/cron.daily/suse.de-snapper + if HAVE_ZYPP install -D zypp-plugin.py $(DESTDIR)/usr/lib/zypp/plugins/commit/snapper.py endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.6/scripts/Makefile.in new/snapper-0.2.6/scripts/Makefile.in --- old/snapper-0.2.6/scripts/Makefile.in 2015-02-20 17:15:19.000000000 +0100 +++ new/snapper-0.2.6/scripts/Makefile.in 2015-03-03 11:07:54.000000000 +0100 @@ -525,6 +525,7 @@ install-data-local: install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/suse.de-snapper install -D snapper-daily $(DESTDIR)/etc/cron.daily/suse.de-snapper + @HAVE_ZYPP_TRUE@ install -D zypp-plugin.py $(DESTDIR)/usr/lib/zypp/plugins/commit/snapper.py # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.6/snapper/Makefile.am new/snapper-0.2.6/snapper/Makefile.am --- old/snapper-0.2.6/snapper/Makefile.am 2015-02-18 18:54:03.000000000 +0100 +++ new/snapper-0.2.6/snapper/Makefile.am 2015-02-24 13:22:19.000000000 +0100 @@ -53,7 +53,7 @@ libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@ -libsnapper_la_LIBADD = -lboost_thread-mt -lboost_system-mt -lxml2 -lacl -lz -lm +libsnapper_la_LIBADD = -lboost_thread -lboost_system -lxml2 -lacl -lz -lm if ENABLE_ROLLBACK libsnapper_la_LIBADD += -lmount endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.6/snapper/Makefile.in new/snapper-0.2.6/snapper/Makefile.in --- old/snapper-0.2.6/snapper/Makefile.in 2015-02-20 17:15:20.000000000 +0100 +++ new/snapper-0.2.6/snapper/Makefile.in 2015-03-03 11:07:54.000000000 +0100 @@ -400,8 +400,8 @@ SnapperTmpl.h SnapperTypes.h SnapperDefines.h Version.h \ $(am__append_1) $(am__append_2) $(am__append_3) libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@ -libsnapper_la_LIBADD = -lboost_thread-mt -lboost_system-mt -lxml2 \ - -lacl -lz -lm $(am__append_4) +libsnapper_la_LIBADD = -lboost_thread -lboost_system -lxml2 -lacl -lz \ + -lm $(am__append_4) pkginclude_HEADERS = \ Version.h \ Snapper.h \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.6/snapper.spec.in new/snapper-0.2.6/snapper.spec.in --- old/snapper-0.2.6/snapper.spec.in 2015-02-18 18:54:03.000000000 +0100 +++ new/snapper-0.2.6/snapper.spec.in 2015-03-02 17:53:16.000000000 +0100 @@ -116,6 +116,7 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/snapper /etc/cron.hourly/suse.de-snapper /etc/cron.daily/suse.de-snapper +/usr/lib/systemd/system/snapper-*.* %config /etc/dbus-1/system.d/org.opensuse.Snapper.conf %{prefix}/share/dbus-1/system-services/org.opensuse.Snapper.service -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
