Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2015-07-22 09:19:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-04 09:03:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2015-07-22 09:19:18.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jul 07 12:49:16 CEST 2015 - aschn...@suse.de + +- extended snapper-configs man-page + +------------------------------------------------------------------- +Mon Jun 29 14:52:31 CEST 2015 - aschn...@suse.de + +- allow to set cleanup algorithm for snapshots created by helper + programs + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper-0.2.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.7/README new/snapper-0.2.7/README --- old/snapper-0.2.7/README 2014-01-29 16:48:30.000000000 +0100 +++ new/snapper-0.2.7/README 2015-06-08 17:40:43.000000000 +0200 @@ -6,3 +6,20 @@ For more information visit http://snapper.io/. +Releasing +========= + +Before releasing package ensure that changes made to package are mentioned +in `package/snapper.changes`. +To create package use commands `make -f Makefile.repo && make package`. +Then use common work-flow to submit package to build service. For factory +send at first package to devel project YaST:Head on OBS. + +When version is increased then git repo have to be tagged. For tag use existing +convention `vX.Y.Z`. Also obs project filesystems:snapper have to be updated. +Please note, that this OBS project builds for more distribution so more metadata +files have to be updated. See OBS documentation for more info. Generated bzip2 +tarball have to be placed on ftp.suse.com/pub/projects/snapper. When +documentation changes e.g. man page or an important functionality, then also +snapper.io webpages have to be updated. It is hosted as github pages in gh-pages +branch in snapper git repository. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.7/client/installation-helper.cc new/snapper-0.2.7/client/installation-helper.cc --- old/snapper-0.2.7/client/installation-helper.cc 2015-05-27 11:24:19.000000000 +0200 +++ new/snapper-0.2.7/client/installation-helper.cc 2015-06-29 14:59:43.000000000 +0200 @@ -47,7 +47,8 @@ void -step1(const string& device, const string& description, const map<string, string>& userdata) +step1(const string& device, const string& description, const string& cleanup, + const map<string, string>& userdata) { // step runs in inst-sys @@ -96,6 +97,7 @@ SCD scd; scd.read_only = false; scd.description = description; + scd.cleanup = cleanup; scd.userdata = userdata; Snapshots::iterator snapshot = snapper.createSingleSnapshot(scd); @@ -196,23 +198,24 @@ } bool -step5(const string& root_prefix, const string& description, const string& snapshot_type, - unsigned int pre_num, const map<string, string>& userdata) +step5(const string& root_prefix, const string& snapshot_type, unsigned int pre_num, + const string& description, const string& cleanup, const map<string, string>& userdata) { // fate #317973 // preconditions (maybe incomplete): // snapper rpms installed - Snapshots::iterator snapshot; SCD scd; - scd.read_only = true; scd.description = description; + scd.cleanup = cleanup; scd.userdata = userdata; Snapper snapper("root", root_prefix); + Snapshots::iterator snapshot; + try { if (snapshot_type == "single") { @@ -264,10 +267,11 @@ { "device", required_argument, 0, 0 }, { "root-prefix", required_argument, 0, 0 }, { "default-subvolume-name", required_argument, 0, 0 }, - { "description", required_argument, 0, 0 }, { "snapshot-type", required_argument, 0, 0 }, { "pre-num", required_argument, 0, 0 }, - { "userdata", required_argument, 0, 'u' }, + { "description", required_argument, 0, 0 }, + { "cleanup", required_argument, 0, 0 }, + { "userdata", required_argument, 0, 0 }, { 0, 0, 0, 0 } }; @@ -275,9 +279,10 @@ string device; string root_prefix = "/"; string default_subvolume_name; - string description; string snapshot_type = "single"; unsigned int pre_num = 0; + string description; + string cleanup; map<string, string> userdata; GetOpts getopts; @@ -300,20 +305,23 @@ if ((opt = opts.find("default-subvolume-name")) != opts.end()) default_subvolume_name = opt->second; - if ((opt = opts.find("description")) != opts.end()) - description = opt->second; - if ((opt = opts.find("snapshot-type")) != opts.end()) snapshot_type = opt->second; if ((opt = opts.find("pre-num")) != opts.end()) pre_num = read_num(opt->second); + if ((opt = opts.find("description")) != opts.end()) + description = opt->second; + + if ((opt = opts.find("cleanup")) != opts.end()) + cleanup = opt->second; + if ((opt = opts.find("userdata")) != opts.end()) userdata = read_userdata(opt->second); if (step == "1") - step1(device, description, userdata); + step1(device, description, cleanup, userdata); else if (step == "2") step2(device, root_prefix, default_subvolume_name); else if (step == "3") @@ -321,5 +329,5 @@ else if (step == "4") step4(); else if (step == "5") - return step5(root_prefix, description, snapshot_type, pre_num, userdata) ? EXIT_SUCCESS : EXIT_FAILURE; + return step5(root_prefix, snapshot_type, pre_num, description, cleanup, userdata) ? EXIT_SUCCESS : EXIT_FAILURE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.2.7/doc/snapper-configs.xml.in new/snapper-0.2.7/doc/snapper-configs.xml.in --- old/snapper-0.2.7/doc/snapper-configs.xml.in 2014-12-12 14:01:22.000000000 +0100 +++ new/snapper-0.2.7/doc/snapper-configs.xml.in 2015-07-07 12:59:55.000000000 +0200 @@ -239,6 +239,13 @@ </variablelist> </refsect1> + <refsect1 id='notes'> + <title>NOTES</title> + <para>The default values stated here are the values snapper uses when the + entry is missing in the configuration file. Some are not identical to the + values from the configuration file template.</para> + </refsect1> + <refsect1 id='homepage'> <title>HOMEPAGE</title> <para><ulink url='http://snapper.io/'>http://snapper.io/</ulink></para>
