commit yast2-snapper for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-snapper for openSUSE:Factory checked in at 2015-02-22 17:23:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-12-16 14:47:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-snapper.new/yast2-snapper.changes 2015-02-22 17:23:39.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 16 12:10:50 CET 2015 - aschnell@suse.de + +- adapted to changes in snapper +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-snapper-3.1.5.tar.bz2 New: ---- yast2-snapper-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-snapper.spec ++++++ --- /var/tmp/diff_new_pack.de7wHC/_old 2015-02-22 17:23:40.000000000 +0100 +++ /var/tmp/diff_new_pack.de7wHC/_new 2015-02-22 17:23:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-snapper # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-snapper -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,7 +26,7 @@ BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: libbtrfs-devel -BuildRequires: libsnapper-devel >= 0.0.17 +BuildRequires: libsnapper-devel >= 0.2.6 BuildRequires: libtool BuildRequires: update-desktop-files BuildRequires: yast2 ++++++ yast2-snapper-3.1.5.tar.bz2 -> yast2-snapper-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-3.1.5/agent-snapper/src/SnapperAgent.cc new/yast2-snapper-3.1.6/agent-snapper/src/SnapperAgent.cc --- old/yast2-snapper-3.1.5/agent-snapper/src/SnapperAgent.cc 2014-12-12 16:30:14.000000000 +0100 +++ new/yast2-snapper-3.1.6/agent-snapper/src/SnapperAgent.cc 2015-02-18 19:20:11.000000000 +0100 @@ -1,10 +1,9 @@ -/* SnapperAgent.cc +/* + * SnapperAgent.cc * * An agent for accessing snapper library * * Authors: Jiri Suchomel <jsuchome@suse.cz> - * - * $Id: SnapperAgent.cc 63174 2011-01-13 10:50:42Z jsuchome $ */ #include "SnapperAgent.h" @@ -72,7 +71,7 @@ YCPMap map2ycpmap (const map<string, string>& userdata) { - YCPMap m; + YCPMap m; for (map<string, string>::const_iterator it = userdata.begin(); it != userdata.end(); ++it) { m->add (YCPString (it->first), YCPString (it->second)); @@ -82,7 +81,7 @@ map<string, string> ycpmap2stringmap (const YCPMap &ycp_map) { - map<string, string> m; + map<string, string> m; for (YCPMap::const_iterator i = ycp_map->begin(); i != ycp_map->end(); i++) { string key = i->first->asString()->value(); @@ -113,15 +112,14 @@ // call ioctl to create or delete specific btrfs subvolume YCPBoolean btrfs_ioctl_call(string path, int request) { - - if (path == "") { + if (path.empty()) { y2error ("'path' attribute missing!"); return YCPBoolean (false); } // find a directory one level up // (FIXME check for path ending with /) - int idx = path.rfind('/'); + string::size_type idx = path.rfind('/'); string updir = path.substr(0, idx); string name = path.substr(idx + 1); @@ -131,7 +129,7 @@ y2error("opening directory '%s' failed", updir.c_str()); return YCPBoolean (false); } - + struct btrfs_ioctl_vol_args args; memset(&args, 0, sizeof(args)); strncpy(args.name, name.c_str(), sizeof(args.name) - 1); @@ -189,8 +187,8 @@ /** * Read */ -YCPValue SnapperAgent::Read(const YCPPath &path, const YCPValue& arg, const YCPValue& opt) { - +YCPValue SnapperAgent::Read(const YCPPath &path, const YCPValue& arg, const YCPValue& opt) +{ y2debug ("path in Read: '%s'.", path->toString().c_str()); YCPValue ret = YCPVoid(); @@ -203,7 +201,7 @@ snapper_error = "not_initialized"; return YCPVoid(); } - + if (path->length() == 1) { /** @@ -216,7 +214,7 @@ path = arg->asString()->value(); } - if (path == "") { + if (path.empty()) { y2error ("path attribute missing!"); return YCPBoolean (false); } @@ -238,7 +236,7 @@ YCPList retlist; try { - list<ConfigInfo> configs = Snapper::getConfigs(); + list<ConfigInfo> configs = Snapper::getConfigs("/"); for (list<ConfigInfo>::const_iterator it = configs.begin(); it != configs.end(); ++it) { retlist->add (YCPString (it->getConfigName())); @@ -287,8 +285,8 @@ switch (it->getType()) { - case SINGLE: s->add (YCPString ("type"), YCPSymbol ("SINGLE")); break; - case PRE: s->add (YCPString ("type"), YCPSymbol ("PRE")); break; + case SINGLE: s->add (YCPString ("type"), YCPSymbol ("SINGLE")); break; + case PRE: s->add (YCPString ("type"), YCPSymbol ("PRE")); break; case POST: s->add (YCPString ("type"), YCPSymbol ("POST")); break; } @@ -430,7 +428,7 @@ * Execute (.snapper) call: Initialize snapper object */ if (path->length() == 0) { - + snapper_initialized = false; if (sh) { @@ -441,7 +439,7 @@ string config_name = getValue (argmap, YCPString ("config"), "root"); try { - sh = new Snapper(config_name); + sh = new Snapper(config_name, "/"); } catch (const ConfigNotFoundException& e) { @@ -472,7 +470,7 @@ try { - Snapper::createConfig(config_name, subvolume, fstype, template_name); + Snapper::createConfig(config_name, "/", subvolume, fstype, template_name); } catch (const CreateConfigFailedException& e) { @@ -489,14 +487,14 @@ string name = getValue(argmap, YCPString("config_name"), ""); - if (name == "") { + if (name.empty()) { y2error ("'config_name' attribute missing!"); return YCPBoolean (false); } try { - Snapper::deleteConfig(name); + Snapper::deleteConfig(name, "/"); } catch (const ConfigNotFoundException& e) { @@ -520,21 +518,22 @@ if (PC(0) == "create") { - string description = getValue (argmap, YCPString ("description"), ""); - string cleanup = getValue (argmap, YCPString ("cleanup"), ""); - string type = getValue (argmap, YCPString ("type"), "single"); - YCPMap userdata = getMapValue (argmap, YCPString ("userdata")); + string type = getValue (argmap, YCPString ("type"), "single"); + + SCD scd; + scd.uid = getuid(); + scd.description = getValue(argmap, YCPString("description"), ""); + scd.cleanup = getValue(argmap, YCPString("cleanup"), ""); + scd.userdata = ycpmap2stringmap(getMapValue(argmap, YCPString("userdata"))); const Snapshots& snapshots = sh->getSnapshots(); if (type == "single") { - sh->createSingleSnapshot(getuid(), description, cleanup, - ycpmap2stringmap(userdata)); + sh->createSingleSnapshot(scd); } else if (type == "pre") { - sh->createPreSnapshot(getuid(), description, cleanup, - ycpmap2stringmap(userdata)); - } + sh->createPreSnapshot(scd); + } else if (type == "post") { // check if pre was given! int pre = getIntValue (argmap, YCPString ("pre"), -1); @@ -553,8 +552,7 @@ } else { - sh->createPostSnapshot(snap1, getuid(), description, cleanup, - ycpmap2stringmap(userdata)); + sh->createPostSnapshot(snap1, scd); } } } @@ -578,16 +576,18 @@ return YCPBoolean (false); } - string description = argmap->hasKey(YCPString("description")) ? + SMD smd; + + smd.description = argmap->hasKey(YCPString("description")) ? getValue(argmap, YCPString("description"), "") : snap->getDescription(); - string cleanup = argmap->hasKey(YCPString("cleanup")) ? + smd.cleanup = argmap->hasKey(YCPString("cleanup")) ? getValue(argmap, YCPString("cleanup"), "") : snap->getCleanup(); - map<string, string> userdata = argmap->hasKey(YCPString("userdata")) ? + smd.userdata = argmap->hasKey(YCPString("userdata")) ? ycpmap2stringmap(getMapValue(argmap, YCPString("userdata"))) : snap->getUserdata(); - sh->modifySnapshot(snap, description, cleanup, userdata); + sh->modifySnapshot(snap, smd); return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-3.1.5/package/yast2-snapper.changes new/yast2-snapper-3.1.6/package/yast2-snapper.changes --- old/yast2-snapper-3.1.5/package/yast2-snapper.changes 2014-12-12 16:30:14.000000000 +0100 +++ new/yast2-snapper-3.1.6/package/yast2-snapper.changes 2015-02-18 19:20:11.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 16 12:10:50 CET 2015 - aschnell@suse.de + +- adapted to changes in snapper +- 3.1.6 + +------------------------------------------------------------------- Fri Dec 12 13:11:35 CET 2014 - aschnell@suse.de - handle invalid UTF-8 in file diff (bsc#907679) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-3.1.5/package/yast2-snapper.spec new/yast2-snapper-3.1.6/package/yast2-snapper.spec --- old/yast2-snapper-3.1.5/package/yast2-snapper.spec 2014-12-12 16:30:14.000000000 +0100 +++ new/yast2-snapper-3.1.6/package/yast2-snapper.spec 2015-02-18 19:20:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-snapper # -# Copyright (c) 2014 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 @@ -17,7 +17,7 @@ Name: yast2-snapper -Version: 3.1.5 +Version: 3.1.6 Release: 0 Group: System/YaST @@ -29,7 +29,7 @@ BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: libbtrfs-devel -BuildRequires: libsnapper-devel >= 0.0.17 +BuildRequires: libsnapper-devel >= 0.2.6 BuildRequires: libtool BuildRequires: update-desktop-files BuildRequires: yast2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠hilbert.suse.de