Hello community,
here is the log from the commit of package snapper for openSUSE:Factory checked
in at 2014-02-07 16:44:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-01-30
09:02:23.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2014-02-07
16:44:32.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Feb 05 10:50:25 CET 2014 - aschn...@suse.de
+
+- fixed execution of grub scripts
+- 0.2.1
+
+-------------------------------------------------------------------
Old:
----
snapper-0.2.0.tar.bz2
New:
----
snapper-0.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ snapper.spec ++++++
--- /var/tmp/diff_new_pack.3U6wfi/_old 2014-02-07 16:44:33.000000000 +0100
+++ /var/tmp/diff_new_pack.3U6wfi/_new 2014-02-07 16:44:33.000000000 +0100
@@ -17,7 +17,7 @@
Name: snapper
-Version: 0.2.0
+Version: 0.2.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: snapper-%{version}.tar.bz2
@@ -116,6 +116,8 @@
%if 0%{?suse_version}
PreReq: %fillup_prereq
%endif
+# expands to Obsoletes: libsnapper1 libsnapper2 libsnapper3...
+Obsoletes: %(echo `seq -s " " -f "libsnapper%.f" $((2 - 1))`)
%description -n libsnapper2
This package contains libsnapper, a library for filesystem snapshot management.
++++++ snapper-0.2.0.tar.bz2 -> snapper-0.2.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.2.0/VERSION new/snapper-0.2.1/VERSION
--- old/snapper-0.2.0/VERSION 2014-01-29 16:48:30.000000000 +0100
+++ new/snapper-0.2.1/VERSION 2014-02-05 11:22:19.000000000 +0100
@@ -1 +1 @@
-0.2.0
+0.2.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.2.0/doc/html.xsl
new/snapper-0.2.1/doc/html.xsl
--- old/snapper-0.2.0/doc/html.xsl 2014-01-29 16:48:30.000000000 +0100
+++ new/snapper-0.2.1/doc/html.xsl 2014-01-31 10:38:25.000000000 +0100
@@ -1,5 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:import
href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
+
<xsl:output indent="yes"/>
+
+ <!-- Turn citerefentry elements into HTML links -->
+ <xsl:param name="citerefentry.link" select="1"/>
+
+ <!-- But not for those with role=nolink -->
+ <xsl:template match="citerefentry[@role='nolink']">
+ <xsl:call-template name="inline.charseq"/>
+ </xsl:template>
+
+ <!-- Code to generate the URL for a given citerefentry element -->
+ <xsl:template name="generate.citerefentry.link">
+ <xsl:value-of select="refentrytitle"/>
+ <xsl:text>.html</xsl:text>
+ </xsl:template>
+
</xsl:stylesheet>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.2.0/doc/pam_snapper.xml.in
new/snapper-0.2.1/doc/pam_snapper.xml.in
--- old/snapper-0.2.0/doc/pam_snapper.xml.in 2014-01-29 16:48:30.000000000
+0100
+++ new/snapper-0.2.1/doc/pam_snapper.xml.in 2014-01-31 10:38:25.000000000
+0100
@@ -167,8 +167,8 @@
<title>SEE ALSO</title>
<para>
<citerefentry><refentrytitle>snapper</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-
<citerefentry><refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-
<citerefentry><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry
role="nolink"><refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry
role="nolink"><refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
pam_snapper_homeconvert,
pam_snapper_pamconfig,
pam_snapper_useradd,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.2.0/doc/snapper-zypp-plugin.xml.in
new/snapper-0.2.1/doc/snapper-zypp-plugin.xml.in
--- old/snapper-0.2.0/doc/snapper-zypp-plugin.xml.in 2014-01-29
16:48:30.000000000 +0100
+++ new/snapper-0.2.1/doc/snapper-zypp-plugin.xml.in 2014-01-31
10:38:25.000000000 +0100
@@ -52,8 +52,8 @@
<para>
<citerefentry><refentrytitle>snapper-zypp-plugin.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>snapper</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-
<citerefentry><refentrytitle>zypper</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-
<citerefentry><refentrytitle>YaST</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ <citerefentry
role="nolink"><refentrytitle>zypper</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry
role="nolink"><refentrytitle>YaST</refentrytitle><manvolnum>8</manvolnum></citerefentry>
</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.2.0/doc/snapper.xml.in
new/snapper-0.2.1/doc/snapper.xml.in
--- old/snapper-0.2.0/doc/snapper.xml.in 2014-01-29 16:48:30.000000000
+0100
+++ new/snapper-0.2.1/doc/snapper.xml.in 2014-01-31 10:38:25.000000000
+0100
@@ -148,7 +148,7 @@
pattern. When snapper computes the difference between two snapshots it
ignores all files and directories matching any of those patterns by
using
-
<citerefentry><refentrytitle>fnmatch</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+ <citerefentry
role="nolink"><refentrytitle>fnmatch</refentrytitle><manvolnum>3</manvolnum></citerefentry>
with the flag FNM_LEADING_DIR.</para>
<para>Note that filters do not exclude files or directories from being
@@ -572,11 +572,12 @@
<title>SEE ALSO</title>
<para>
<citerefentry><refentrytitle>snapper-configs</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+
<citerefentry><refentrytitle>snapper-zypp-plugin</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>pam_snapper</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-
<citerefentry><refentrytitle>btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-
<citerefentry><refentrytitle>lvm</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-
<citerefentry><refentrytitle>attr</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-
<citerefentry><refentrytitle>acl</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ <citerefentry
role="nolink"><refentrytitle>btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry
role="nolink"><refentrytitle>lvm</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry
role="nolink"><refentrytitle>attr</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry
role="nolink"><refentrytitle>acl</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.2.0/doc/snapperd.xml.in
new/snapper-0.2.1/doc/snapperd.xml.in
--- old/snapper-0.2.0/doc/snapperd.xml.in 2014-01-29 16:48:30.000000000
+0100
+++ new/snapper-0.2.1/doc/snapperd.xml.in 2014-01-31 10:38:25.000000000
+0100
@@ -43,7 +43,7 @@
<title>SEE ALSO</title>
<para>
<citerefentry><refentrytitle>snapper</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-
<citerefentry><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+ <citerefentry
role="nolink"><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</para>
</refsect1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.2.0/snapper/Btrfs.cc
new/snapper-0.2.1/snapper/Btrfs.cc
--- old/snapper-0.2.0/snapper/Btrfs.cc 2014-01-29 16:48:30.000000000 +0100
+++ new/snapper-0.2.1/snapper/Btrfs.cc 2014-02-03 16:47:51.000000000 +0100
@@ -1103,7 +1103,7 @@
u64 parent_root_id = 0;
string name1 = string(dir1.fullname(), base.fullname().size() + 1);
- if (get_root_id(name1, &parent_root_id) < 0)
+ if (!get_root_id(name1, &parent_root_id))
{
y2err("could not resolve root_id for " << name1);
throw BtrfsSendReceiveException();
@@ -1128,7 +1128,9 @@
{
StopWatch stopwatch;
- StreamProcessor processor(openSubvolumeDir(), dir1, dir2);
+ const SDir subvolume(openSubvolumeDir());
+
+ StreamProcessor processor(subvolume, dir1, dir2);
processor.process(cb);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.2.0/snapper/Lvm.cc
new/snapper-0.2.1/snapper/Lvm.cc
--- old/snapper-0.2.0/snapper/Lvm.cc 2014-01-29 16:48:30.000000000 +0100
+++ new/snapper-0.2.1/snapper/Lvm.cc 2014-02-05 14:22:06.000000000 +0100
@@ -370,7 +370,7 @@
{
SystemCmd cmd(string(LVMBIN " version"));
- if (cmd.retcode() != 0)
+ if (cmd.retcode() != 0 || cmd.stdout().empty())
{
y2war("Couldn't get LVM version info");
}
@@ -378,7 +378,7 @@
{
Regex
rx(".*LVM[[:space:]]+version:[[:space:]]+([0-9]+)\\.([0-9]+)\\.([0-9]+).*$");
- if (!rx.match(cmd.getLine(0)))
+ if (!rx.match(cmd.stdout().front()))
{
y2war("LVM version format didn't match");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.2.0/snapper/LvmCache.cc
new/snapper-0.2.1/snapper/LvmCache.cc
--- old/snapper-0.2.0/snapper/LvmCache.cc 2014-01-29 16:48:30.000000000
+0100
+++ new/snapper-0.2.1/snapper/LvmCache.cc 2014-02-05 14:22:06.000000000
+0100
@@ -142,15 +142,14 @@
boost::unique_lock<boost::shared_mutex> unique_lock(lv_mutex);
SystemCmd cmd(LVSBIN " --noheadings -o lv_attr,segtype " +
quote(vg->get_vg_name() + "/" + lv_name));
-
- if (cmd.retcode() != 0 || cmd.numLines() < 1)
+ if (cmd.retcode() != 0 || cmd.stdout().empty())
{
y2err("lvm cache: failed to get info about " << vg->get_vg_name()
<< "/" << lv_name);
throw LvmCacheException();
}
vector<string> args;
- const string tmp = boost::trim_copy(cmd.getLine(0));
+ const string tmp = boost::trim_copy(cmd.stdout().front());
boost::split(args, tmp, boost::is_any_of(" \t\n"),
boost::token_compress_on);
if (args.size() < 1)
throw LvmCacheException();
@@ -282,14 +281,14 @@
else
{
SystemCmd cmd(LVSBIN " --noheadings -o lv_attr,segtype " +
quote(vg_name + "/" + lv_name));
- if (cmd.retcode() != 0 || cmd.numLines() < 1)
+ if (cmd.retcode() != 0 || cmd.stdout().empty())
{
y2err("lvm cache: failed to get info about " << vg_name << "/"
<< lv_name);
throw LvmCacheException();
}
vector<string> args;
- const string tmp = boost::trim_copy(cmd.getLine(0));
+ const string tmp = boost::trim_copy(cmd.stdout().front());
boost::split(args, tmp, boost::is_any_of(" \t\n"),
boost::token_compress_on);
if (args.size() < 1)
throw LvmCacheException();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.2.0/snapper/SystemCmd.cc
new/snapper-0.2.1/snapper/SystemCmd.cc
--- old/snapper-0.2.0/snapper/SystemCmd.cc 2014-01-29 16:48:30.000000000
+0100
+++ new/snapper-0.2.1/snapper/SystemCmd.cc 2014-02-05 14:22:06.000000000
+0100
@@ -49,14 +49,6 @@
}
- SystemCmd::SystemCmd(bool log_output)
- : Combine_b(false), log_output(log_output)
-{
- y2mil("constructor SystemCmd");
- init();
-}
-
-
void SystemCmd::init()
{
File_aC[0] = File_aC[1] = NULL;
@@ -418,43 +410,6 @@
}
-int
-SystemCmd::select( const string& Pat_Cv, OutputStream Idx_iv )
- {
- if( Idx_iv > 1 )
- {
- y2err("invalid index " << Idx_iv);
- }
- string Search_Ci( Pat_Cv );
- bool BeginOfLine_bi = Search_Ci.length()>0 && Search_Ci[0]=='^';
- if( BeginOfLine_bi )
- {
- Search_Ci.erase( 0, 1 );
- }
- SelLines_aC[Idx_iv].resize(0);
- int Size_ii = 0;
- int End_ii = Lines_aC[Idx_iv].size();
- for( int I_ii=0; I_ii<End_ii; I_ii++ )
- {
- string::size_type Pos_ii = Lines_aC[Idx_iv][I_ii].find( Search_Ci );
- if( Pos_ii>0 && BeginOfLine_bi )
- {
- Pos_ii = string::npos;
- }
- if (Pos_ii != string::npos)
- {
- SelLines_aC[Idx_iv].resize( Size_ii+1 );
- SelLines_aC[Idx_iv][Size_ii] = &Lines_aC[Idx_iv][I_ii];
- y2deb("Select Added Line " << Size_ii << " \"" <<
*SelLines_aC[Idx_iv][Size_ii] << "\"");
- Size_ii++;
- }
- }
-
- y2mil("Pid:" << Pid_i << " Idx:" << Idx_iv << " Pattern:\"" << Pat_Cv <<
"\" Lines:" << Size_ii);
- return Size_ii;
- }
-
-
void
SystemCmd::invalidate()
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.2.0/snapper/SystemCmd.h
new/snapper-0.2.1/snapper/SystemCmd.h
--- old/snapper-0.2.0/snapper/SystemCmd.h 2014-01-29 16:48:30.000000000
+0100
+++ new/snapper-0.2.1/snapper/SystemCmd.h 2014-02-05 14:22:06.000000000
+0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) [2004-2012] Novell, Inc.
+ * Copyright (c) [2004-2014] Novell, Inc.
*
* All Rights Reserved.
*
@@ -45,23 +45,27 @@
enum OutputStream { IDX_STDOUT, IDX_STDERR };
SystemCmd(const string& Command_Cv, bool log_output = true);
- SystemCmd(bool log_output = true);
virtual ~SystemCmd();
+ protected:
+
int execute(const string& Command_Cv);
int executeBackground(const string& Command_Cv);
int executeRestricted(const string& Command_Cv,
unsigned long MaxTimeSec, unsigned long
MaxLineOut,
bool& ExceedTime, bool& ExceedLines);
+ public:
+
const vector<string>& stdout() const { return Lines_aC[IDX_STDOUT]; }
const vector<string>& stderr() const { return Lines_aC[IDX_STDERR]; }
string cmd() const { return lastCmd; }
int retcode() const { return Ret_i; }
- int select(const string& Reg_Cv, OutputStream Idx_ii = IDX_STDOUT);
+ protected:
+
unsigned numLines(bool Selected_bv = false, OutputStream Idx_ii =
IDX_STDOUT) const;
string getLine(unsigned Num_iv, bool Selected_bv = false, OutputStream
Idx_ii = IDX_STDOUT) const;
@@ -69,6 +73,8 @@
static void setTestmode(bool testmode = true);
+ public:
+
/**
* Quotes and protects a single string for shell execution.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/snapper-0.2.0/snapper.spec.in
new/snapper-0.2.1/snapper.spec.in
--- old/snapper-0.2.0/snapper.spec.in 2014-01-29 17:28:22.000000000 +0100
+++ new/snapper-0.2.1/snapper.spec.in 2014-02-06 10:28:56.000000000 +0100
@@ -116,6 +116,8 @@
%if 0%{?suse_version}
PreReq: %fillup_prereq
%endif
+# expands to Obsoletes: libsnapper1 libsnapper2 libsnapper3...
+Obsoletes: %(echo `seq -s " " -f "libsnapper%.f" $((@LIBVERSION_MAJOR@ -
1))`)
%description -n libsnapper@LIBVERSION_MAJOR@
This package contains libsnapper, a library for filesystem snapshot management.
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
