Hello community, here is the log from the commit of package yast2-snapper for openSUSE:Factory checked in at 2013-11-15 14:28:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-snapper (Old) and /work/SRC/openSUSE:Factory/.yast2-snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-snapper" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-snapper/yast2-snapper.changes 2013-10-20 10:56:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-snapper.new/yast2-snapper.changes 2013-11-15 14:28:05.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 06 09:54:33 CET 2013 - aschn...@suse.de + +- added supplements snapper and yast2 (fate#314695) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-snapper.spec ++++++ --- /var/tmp/diff_new_pack.uCWvzZ/_old 2013-11-15 14:28:06.000000000 +0100 +++ /var/tmp/diff_new_pack.uCWvzZ/_new 2013-11-15 14:28:06.000000000 +0100 @@ -26,9 +26,8 @@ BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: libbtrfs-devel -BuildRequires: libsnapper-devel >= 0.0.11 +BuildRequires: libsnapper-devel >= 0.0.17 BuildRequires: libtool -BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files BuildRequires: yast2 BuildRequires: yast2-core-devel >= 2.23.1 @@ -37,6 +36,7 @@ Requires: yast2 >= 2.21.22 Requires: yast2-ruby-bindings >= 1.0.0 +Supplements: packageand(snapper:yast2) # require the version of libsnapper used during build (bnc#845618) %requires_eq libsnapper2 ++++++ yast2-snapper-3.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-3.1.1/CONTRIBUTING.md new/yast2-snapper-3.1.1/CONTRIBUTING.md --- old/yast2-snapper-3.1.1/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-snapper-3.1.1/CONTRIBUTING.md 2013-11-06 09:56:09.000000000 +0100 @@ -0,0 +1,87 @@ +YaST Contribution Guidelines +============================ + +YaST is an open source project and as such it welcomes all kinds of +contributions. If you decide to contribute, please follow these guidelines to +ensure the process is effective and pleasant both for you and YaST maintainers. + +There are two main forms of contribution: reporting bugs and performing code +changes. + +Bug Reports +----------- + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +or [GitHub issues](../../issues). (For Bugzilla, use the [simplified +registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) +if you don't have an account yet.) + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +that every bug will be fixed, but we'll try. + +When creating a bug report, please follow our [bug reporting +guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). + +Code Changes +------------ + +We welcome all kinds of code contributions, from simple bug fixes to significant +refactorings and implementation of new features. However, before making any +non-trivial contribution, get in touch with us first — this can prevent wasted +effort on both sides. Also, have a look at our [development +documentation](http://en.opensuse.org/openSUSE:YaST_development). + +To send us your code change, use GitHub pull requests. The workflow is as +follows: + + 1. Fork the project. + + 2. Create a topic branch based on `master`. + + 3. Implement your change, including tests (if possible). Make sure you adhere + to the [Ruby style + guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). + + 4. Make sure your change didn't break anything by building the RPM package + (`rake osc:build`). The build process includes running the full testsuite. + + 5. Publish the branch and create a pull request. + + 6. YaST developers will review your change and possibly point out issues. + Adapt the code under their guidance until they are all resolved. + + 7. Finally, the pull request will get merged or rejected. + +See also [GitHub's guide on +contributing](https://help.github.com/articles/fork-a-repo). + +If you want to do multiple unrelated changes, use separate branches and pull +requests. + +Do not change the `VERSION` and `*.changes` files as this could lead to +conflicts. + +### Commits + +Each commit in the pull request should do only one thing, which is clearly +described by its commit message. Especially avoid mixing formatting changes and +functional changes into one commit. When writing commit messages, adhere to +[widely used +conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). + +If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +you mention it in the commit message for cross-reference. Use format like +bnc#775814 or gh#yast/yast-foo#42. See also [GitHub +autolinking](https://help.github.com/articles/github-flavored-markdown#references) +and [openSUSE abbreviation +reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations). + +Additional Information +---------------------- + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +We'll do our best to provide a timely and accurate answer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-3.1.1/MAINTAINER new/yast2-snapper-3.1.1/MAINTAINER --- old/yast2-snapper-3.1.1/MAINTAINER 2013-10-17 09:21:02.000000000 +0200 +++ new/yast2-snapper-3.1.1/MAINTAINER 2013-11-06 09:56:09.000000000 +0100 @@ -1 +1 @@ -Jiri Suchomel <jsuch...@suse.cz> +Arvin Schnell <aschn...@suse.de> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-3.1.1/agent-snapper/Makefile.am new/yast2-snapper-3.1.1/agent-snapper/Makefile.am --- old/yast2-snapper-3.1.1/agent-snapper/Makefile.am 2013-10-17 09:21:02.000000000 +0200 +++ new/yast2-snapper-3.1.1/agent-snapper/Makefile.am 2013-11-06 09:56:09.000000000 +0100 @@ -1 +1 @@ -SUBDIRS = conf doc src +SUBDIRS = doc src diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-3.1.1/agent-snapper/src/SnapperAgent.cc new/yast2-snapper-3.1.1/agent-snapper/src/SnapperAgent.cc --- old/yast2-snapper-3.1.1/agent-snapper/src/SnapperAgent.cc 2013-10-17 09:21:02.000000000 +0200 +++ new/yast2-snapper-3.1.1/agent-snapper/src/SnapperAgent.cc 2013-11-06 09:56:09.000000000 +0100 @@ -146,12 +146,9 @@ /** * Constructor */ -SnapperAgent::SnapperAgent() : SCRAgent() +SnapperAgent::SnapperAgent() + : SCRAgent(), sh(NULL), snapper_initialized(false), snapper_error("") { - sh = NULL; - snapper_initialized = false; - snapper_error = ""; - snapper::setLogDo(&log_do); snapper::setLogQuery(&log_query); } @@ -161,11 +158,7 @@ */ SnapperAgent::~SnapperAgent() { - if (sh) - { - delete sh; - sh = 0; - } + delete sh; } @@ -328,7 +321,7 @@ unsigned int num2 = getIntValue (argmap, YCPString ("to"), 0); /** - * Read(.snapper.diff_list) -> show difference between snapnots num1 and num2 as list. + * Read(.snapper.diff_list) -> show difference between snapshots num1 and num2 as list. */ if (PC(0) == "diff_list") { YCPList retlist; @@ -347,7 +340,7 @@ return retlist; } /** - * Read(.snapper.diff_index) -> show difference between snapnots num1 and num2 as one-level map: + * Read(.snapper.diff_index) -> show difference between snapshots num1 and num2 as one-level map: * (mapping each file to its changes) */ if (PC(0) == "diff_index") { @@ -367,7 +360,7 @@ return retmap; } /** - * Read(.snapper.diff_tree) -> show difference between snapnots num1 and num2 as tree. + * Read(.snapper.diff_tree) -> show difference between snapshots num1 and num2 as tree. */ else if (PC(0) == "diff_tree") { @@ -533,13 +526,14 @@ YCPMap userdata = getMapValue (argmap, YCPString ("userdata")); const Snapshots& snapshots = sh->getSnapshots(); - Snapshots::iterator snap; if (type == "single") { - snap = sh->createSingleSnapshot(description); + sh->createSingleSnapshot(getuid(), description, cleanup, + ycpmap2stringmap(userdata)); } else if (type == "pre") { - snap = sh->createPreSnapshot(description); + sh->createPreSnapshot(getuid(), description, cleanup, + ycpmap2stringmap(userdata)); } else if (type == "post") { // check if pre was given! @@ -559,7 +553,8 @@ } else { - snap = sh->createPostSnapshot(description, snap1); + sh->createPostSnapshot(snap1, getuid(), description, cleanup, + ycpmap2stringmap(userdata)); } } } @@ -568,9 +563,6 @@ return YCPBoolean (false); } - snap->setCleanup (cleanup); - snap->setUserdata (ycpmap2stringmap (userdata)); - snap->flushInfo(); return ret; } else if (PC(0) == "modify") { @@ -586,19 +578,17 @@ return YCPBoolean (false); } - if (argmap->hasKey(YCPString ("description"))) - { - snap->setDescription (getValue (argmap, YCPString ("description"), "")); - } - if (argmap->hasKey(YCPString ("cleanup"))) - { - snap->setCleanup (getValue (argmap, YCPString ("cleanup"), "")); - } - if (argmap->hasKey(YCPString ("userdata"))) - { - snap->setUserdata (ycpmap2stringmap (getMapValue (argmap, YCPString ("userdata")))); - } - snap->flushInfo(); + string description = argmap->hasKey(YCPString("description")) ? + getValue(argmap, YCPString("description"), "") : snap->getDescription(); + + string cleanup = argmap->hasKey(YCPString("cleanup")) ? + getValue(argmap, YCPString("cleanup"), "") : snap->getCleanup(); + + map<string, string> userdata = argmap->hasKey(YCPString("userdata")) ? + ycpmap2stringmap(getMapValue(argmap, YCPString("userdata"))) : snap->getUserdata(); + + sh->modifySnapshot(snap, description, cleanup, userdata); + return ret; } else if (PC(0) == "delete") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-3.1.1/doc/_cvsignore new/yast2-snapper-3.1.1/doc/_cvsignore --- old/yast2-snapper-3.1.1/doc/_cvsignore 2013-10-17 09:21:02.000000000 +0200 +++ new/yast2-snapper-3.1.1/doc/_cvsignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-3.1.1/doc/autodocs/_cvsignore new/yast2-snapper-3.1.1/doc/autodocs/_cvsignore --- old/yast2-snapper-3.1.1/doc/autodocs/_cvsignore 2013-10-17 09:21:02.000000000 +0200 +++ new/yast2-snapper-3.1.1/doc/autodocs/_cvsignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -Makefile -Makefile.in -*.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-3.1.1/package/yast2-snapper.changes new/yast2-snapper-3.1.1/package/yast2-snapper.changes --- old/yast2-snapper-3.1.1/package/yast2-snapper.changes 2013-10-17 09:21:02.000000000 +0200 +++ new/yast2-snapper-3.1.1/package/yast2-snapper.changes 2013-11-06 09:56:09.000000000 +0100 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 06 09:54:33 CET 2013 - aschn...@suse.de + +- added supplements snapper and yast2 (fate#314695) + +------------------------------------------------------------------- Tue Oct 15 16:04:11 CEST 2013 - jsuch...@suse.cz - require the version of libsnapper used during build (bnc#845618) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-3.1.1/package/yast2-snapper.spec new/yast2-snapper-3.1.1/package/yast2-snapper.spec --- old/yast2-snapper-3.1.1/package/yast2-snapper.spec 2013-10-17 09:21:02.000000000 +0200 +++ new/yast2-snapper-3.1.1/package/yast2-snapper.spec 2013-11-06 09:56:09.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-snapper -Version: 3.1.0 +Version: 3.1.1 Release: 0 Group: System/YaST @@ -25,14 +25,21 @@ Source0: %{name}-%{version}.tar.bz2 License: GPL-2.0 -BuildRequires: update-desktop-files yast2 yast2-testsuite libbtrfs-devel -BuildRequires: yast2-devtools >= 3.0.6 -BuildRequires: libsnapper-devel >= 0.0.11 + +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: libbtrfs-devel +BuildRequires: libsnapper-devel >= 0.0.17 +BuildRequires: libtool +BuildRequires: update-desktop-files +BuildRequires: yast2 BuildRequires: yast2-core-devel >= 2.23.1 -BuildRequires: libtool doxygen gcc-c++ perl-XML-Writer +BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-testsuite Requires: yast2 >= 2.21.22 Requires: yast2-ruby-bindings >= 1.0.0 +Supplements: packageand(snapper:yast2) # require the version of libsnapper used during build (bnc#845618) %requires_eq libsnapper2 @@ -51,7 +58,6 @@ %install %yast_install - %files %defattr(-,root,root) %dir %{yast_yncludedir}/snapper diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-3.1.1/src/_cvsignore new/yast2-snapper-3.1.1/src/_cvsignore --- old/yast2-snapper-3.1.1/src/_cvsignore 2013-10-17 09:21:02.000000000 +0200 +++ new/yast2-snapper-3.1.1/src/_cvsignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -Makefile -Makefile.in -*.ybc -.dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-3.1.1/testsuite/_cvsignore new/yast2-snapper-3.1.1/testsuite/_cvsignore --- old/yast2-snapper-3.1.1/testsuite/_cvsignore 2013-10-17 09:21:02.000000000 +0200 +++ new/yast2-snapper-3.1.1/testsuite/_cvsignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -Makefile -Makefile.in -site.exp -*.sum -*.log -tmp.out* -tmp.err* -tmp.log* -config -run -*.test -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
