Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory checked
in at 2014-01-29 22:20:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzypp (Old)
and /work/SRC/openSUSE:Factory/.libzypp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2014-01-27
15:29:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2014-01-29
22:20:32.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Jan 29 10:28:16 CET 2014 - m...@suse.de
+
+- No fileconflict check if DownloadOnly.
+- version 14.9.0 (7)
+
+-------------------------------------------------------------------
Old:
----
libzypp-14.8.0.tar.bz2
New:
----
libzypp-14.9.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.InV6pl/_old 2014-01-29 22:20:33.000000000 +0100
+++ /var/tmp/diff_new_pack.InV6pl/_new 2014-01-29 22:20:33.000000000 +0100
@@ -23,7 +23,7 @@
Summary: Package, Patch, Pattern, and Product Management
License: GPL-2.0+
Group: System/Packages
-Version: 14.8.0
+Version: 14.9.0
Release: 0
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
++++++ libzypp-14.8.0.tar.bz2 -> libzypp-14.9.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/VERSION.cmake
new/libzypp-14.9.0/VERSION.cmake
--- old/libzypp-14.8.0/VERSION.cmake 2014-01-25 17:08:52.000000000 +0100
+++ new/libzypp-14.9.0/VERSION.cmake 2014-01-29 10:28:53.000000000 +0100
@@ -60,9 +60,9 @@
#
SET(LIBZYPP_MAJOR "14")
SET(LIBZYPP_COMPATMINOR "7")
-SET(LIBZYPP_MINOR "8")
+SET(LIBZYPP_MINOR "9")
SET(LIBZYPP_PATCH "0")
#
-# LAST RELEASED: 14.8.0 (7)
+# LAST RELEASED: 14.9.0 (7)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/package/libzypp.changes
new/libzypp-14.9.0/package/libzypp.changes
--- old/libzypp-14.8.0/package/libzypp.changes 2014-01-25 17:08:52.000000000
+0100
+++ new/libzypp-14.9.0/package/libzypp.changes 2014-01-29 10:28:53.000000000
+0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jan 29 10:28:16 CET 2014 - m...@suse.de
+
+- No fileconflict check if DownloadOnly.
+- version 14.9.0 (7)
+
+-------------------------------------------------------------------
Sat Jan 25 17:07:45 CET 2014 - m...@suse.de
- Collect and execute %posttrans scripts delayed (Fate#313506)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/zypp/Arch.h
new/libzypp-14.9.0/zypp/Arch.h
--- old/libzypp-14.8.0/zypp/Arch.h 2013-11-14 11:57:43.000000000 +0100
+++ new/libzypp-14.9.0/zypp/Arch.h 2014-01-29 10:28:53.000000000 +0100
@@ -273,6 +273,10 @@
inline std::ostream & operator<<( std::ostream & str, const Arch & obj )
{ return str << obj.asString(); }
+ /** \relates Arch XML output. */
+ inline std::ostream & dumpAsXmlOn( std::ostream & str, const Arch & obj )
+ { return str << "<arch>" << obj << "</arch>"; }
+
/** \name Equality based on string value. */
//@{
/** \relates Arch */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/zypp/CheckSum.cc
new/libzypp-14.9.0/zypp/CheckSum.cc
--- old/libzypp-14.8.0/zypp/CheckSum.cc 2013-03-20 09:29:30.000000000 +0100
+++ new/libzypp-14.9.0/zypp/CheckSum.cc 2014-01-29 10:28:53.000000000 +0100
@@ -154,6 +154,19 @@
return str << ( obj.type().empty() ? std::string("UNKNOWN") : obj.type() )
<< '-' << obj.checksum();
}
+ std::ostream & dumpAsXmlOn( std::ostream & str, const CheckSum & obj )
+ {
+ const std::string & type( obj.type() );
+ const std::string & checksum( obj.checksum() );
+ str << "<checksum";
+ if ( ! type.empty() ) str << " type=\"" << type << "\"";
+ if ( checksum.empty() )
+ str << "/>";
+ else
+ str << ">" << checksum << "</checksum>";
+ return str;
+ }
+
/** \relates CheckSum */
bool operator==( const CheckSum & lhs, const CheckSum & rhs )
{ return lhs.checksum() == rhs.checksum() && lhs.type() == rhs.type(); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/zypp/CheckSum.h
new/libzypp-14.9.0/zypp/CheckSum.h
--- old/libzypp-14.8.0/zypp/CheckSum.h 2013-10-18 09:00:54.000000000 +0200
+++ new/libzypp-14.9.0/zypp/CheckSum.h 2014-01-29 10:28:53.000000000 +0100
@@ -96,6 +96,9 @@
/** \relates CheckSum Stream output. */
std::ostream & operator<<( std::ostream & str, const CheckSum & obj );
+ /** \relates CheckSum XML output. */
+ std::ostream & dumpAsXmlOn( std::ostream & str, const CheckSum & obj );
+
/** \relates CheckSum */
bool operator==( const CheckSum & lhs, const CheckSum & rhs );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/zypp/Edition.h
new/libzypp-14.9.0/zypp/Edition.h
--- old/libzypp-14.8.0/zypp/Edition.h 2013-03-20 09:29:30.000000000 +0100
+++ new/libzypp-14.9.0/zypp/Edition.h 2014-01-29 10:28:53.000000000 +0100
@@ -178,6 +178,15 @@
};
///////////////////////////////////////////////////////////////////
+ /** \relates Edition XML output. */
+ inline std::ostream & dumpAsXmlOn( std::ostream & str, const Edition & obj )
+ { return str << "<edition"
+ << " epoch=\"" << obj.epoch() << "\""
+ << " version=\"" << obj.version() << "\""
+ << " release=\"" << obj.release() << "\""
+ << "/>";
+ }
+
/////////////////////////////////////////////////////////////////
} // namespace zypp
///////////////////////////////////////////////////////////////////
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/zypp/Repository.cc
new/libzypp-14.9.0/zypp/Repository.cc
--- old/libzypp-14.8.0/zypp/Repository.cc 2013-03-20 09:29:30.000000000
+0100
+++ new/libzypp-14.9.0/zypp/Repository.cc 2014-01-29 10:28:53.000000000
+0100
@@ -15,6 +15,7 @@
#include "zypp/base/Logger.h"
#include "zypp/base/Gettext.h"
#include "zypp/base/Exception.h"
+#include "zypp/base/Xml.h"
#include "zypp/AutoDispose.h"
#include "zypp/Pathname.h"
@@ -308,6 +309,14 @@
<< "}";
}
+ std::ostream & dumpAsXmlOn( std::ostream & str, const Repository & obj )
+ {
+ return xmlout::node( str, "repository", {
+ { "alias", obj.name() },
+ { "name", obj.alias() }
+ } );
+ }
+
//////////////////////////////////////////////////////////////////
namespace detail
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/zypp/Repository.h
new/libzypp-14.9.0/zypp/Repository.h
--- old/libzypp-14.8.0/zypp/Repository.h 2014-01-24 08:44:53.000000000
+0100
+++ new/libzypp-14.9.0/zypp/Repository.h 2014-01-29 10:28:53.000000000
+0100
@@ -284,6 +284,9 @@
/** \relates Repository Stream output */
std::ostream & operator<<( std::ostream & str, const Repository & obj );
+ /** \relates Repository XML output */
+ std::ostream & dumpAsXmlOn( std::ostream & str, const Repository & obj );
+
/** \relates Repository */
inline bool operator==( const Repository & lhs, const Repository & rhs )
{ return lhs.get() == rhs.get(); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/zypp/ResKind.h
new/libzypp-14.9.0/zypp/ResKind.h
--- old/libzypp-14.8.0/zypp/ResKind.h 2013-03-20 09:29:30.000000000 +0100
+++ new/libzypp-14.9.0/zypp/ResKind.h 2014-01-29 10:28:53.000000000 +0100
@@ -81,6 +81,10 @@
IdString _str;
};
+ /** \relates ResKind XML output. */
+ inline std::ostream & dumpAsXmlOn( std::ostream & str, const ResKind & obj )
+ { return str << "<kind>" << obj << "</kind>"; }
+
/////////////////////////////////////////////////////////////////
} // namespace zypp
///////////////////////////////////////////////////////////////////
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/zypp/base/Xml.h
new/libzypp-14.9.0/zypp/base/Xml.h
--- old/libzypp-14.8.0/zypp/base/Xml.h 2014-01-24 08:44:53.000000000 +0100
+++ new/libzypp-14.9.0/zypp/base/Xml.h 2014-01-29 10:28:53.000000000 +0100
@@ -67,9 +67,10 @@
struct Node
{
NON_COPYABLE_BUT_MOVE( Node );
+ typedef NodeAttr Attr;
/** Ctor taking nodename and attribute list */
- Node( std::ostream & out_r, std::string name_r, const
std::initializer_list<NodeAttr> & attrs_r = {} )
+ Node( std::ostream & out_r, std::string name_r, const
std::initializer_list<Attr> & attrs_r = {} )
: _out( out_r ), _name( std::move(name_r) )
{
if ( ! _name.empty() )
@@ -82,13 +83,13 @@
}
/** Convenience ctor for one attribute pair */
- Node( std::ostream & out_r, std::string name_r, NodeAttr attr_r )
+ Node( std::ostream & out_r, std::string name_r, Attr attr_r )
: Node( out_r, std::move(name_r), { attr_r } )
{}
/** Dtor wrting end tag */
~Node()
- { _out << "</" << _name << ">"; }
+ { if ( ! _name.empty() ) _out << "</" << _name << ">"; }
/** Return the output stream */
std::ostream & operator*() { return _out; }
@@ -104,16 +105,16 @@
* <node attr="val"/>
* \endcode
*/
- void node( std::ostream & out_r, const std::string & name_r, const
std::initializer_list<NodeAttr> & attrs_r = {} )
+ inline std::ostream & node( std::ostream & out_r, const std::string &
name_r, const std::initializer_list<Node::Attr> & attrs_r = {} )
{
out_r << "<" << name_r;
for ( const auto & pair : attrs_r )
out_r << " " << pair.first << "=\"" << xml::escape( pair.second ) <<
"\"";
- out_r << "/>";
+ return out_r << "/>";
}
/** \overload for one attribute pair */
- void node( const std::string & name_r, NodeAttr attr_r )
- { node( name_r, { attr_r } ); }
+ inline std::ostream & node( std::ostream & out_r, const std::string &
name_r, Node::Attr attr_r )
+ { return node( out_r, name_r, { attr_r } ); }
} // namespace xmlout
///////////////////////////////////////////////////////////////////
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/zypp/sat/FileConflicts.cc
new/libzypp-14.9.0/zypp/sat/FileConflicts.cc
--- old/libzypp-14.8.0/zypp/sat/FileConflicts.cc 2014-01-24
11:28:53.000000000 +0100
+++ new/libzypp-14.9.0/zypp/sat/FileConflicts.cc 2014-01-29
10:28:53.000000000 +0100
@@ -15,7 +15,7 @@
#include "zypp/base/LogTools.h"
#include "zypp/base/Gettext.h"
#include "zypp/base/Xml.h"
-#include "zypp/Repository.h"
+#include "zypp/CheckSum.h"
using std::endl;
@@ -145,29 +145,12 @@
namespace
{
- /// \todo
std::ostream & dumpAsXmlHelper( std::ostream & str, const std::string &
tag_r, IdString filename_r, IdString md5sum_r, Solvable solv_r )
{
xmlout::Node guard( str, tag_r );
*xmlout::Node( *guard, "file" ) << filename_r;
- *xmlout::Node( *guard, "checksum", { "type", "md5" } ) << md5sum_r;
- {
- xmlout::Node guard( str, "solvable" );
- *xmlout::Node( *guard, "kind" ) << solv_r.kind();
- *xmlout::Node( *guard, "name" ) << solv_r.name();
- Edition solvEd( solv_r.edition() );
- xmlout::node( *guard, "edition", {
- { "epoch", solvEd.epoch() },
- { "version", solvEd.version() },
- { "release", solvEd.release() }
- } );
- *xmlout::Node( *guard, "arch" ) << solv_r.arch();
- Repository solvrep( solv_r.repository() );
- xmlout::node( *guard, "repository", {
- { "alias", solvrep.name() },
- { "name", solvrep.alias() }
- } );
- }
+ dumpAsXmlOn( *guard, CheckSum( md5sum_r.asString() ) );
+ dumpAsXmlOn( *guard, solv_r );
return str;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/zypp/sat/Solvable.cc
new/libzypp-14.9.0/zypp/sat/Solvable.cc
--- old/libzypp-14.8.0/zypp/sat/Solvable.cc 2014-01-24 08:44:53.000000000
+0100
+++ new/libzypp-14.9.0/zypp/sat/Solvable.cc 2014-01-29 10:28:53.000000000
+0100
@@ -16,6 +16,7 @@
#include "zypp/base/Exception.h"
#include "zypp/base/Functional.h"
#include "zypp/base/Collector.h"
+#include "zypp/base/Xml.h"
#include "zypp/sat/detail/PoolImpl.h"
#include "zypp/sat/Solvable.h"
@@ -675,6 +676,18 @@
return str;
}
+ std::ostream & dumpAsXmlOn( std::ostream & str, const Solvable & obj )
+ {
+ xmlout::Node guard( str, "solvable" );
+
+ dumpAsXmlOn( *guard, obj.kind() );
+ *xmlout::Node( *guard, "name" ) << obj.name();
+ dumpAsXmlOn( *guard, obj.edition() );
+ dumpAsXmlOn( *guard, obj.arch() );
+ dumpAsXmlOn( *guard, obj.repository() );
+ return str;
+ }
+
/////////////////////////////////////////////////////////////////
} // namespace sat
///////////////////////////////////////////////////////////////////
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/zypp/sat/Solvable.h
new/libzypp-14.9.0/zypp/sat/Solvable.h
--- old/libzypp-14.8.0/zypp/sat/Solvable.h 2014-01-24 08:44:53.000000000
+0100
+++ new/libzypp-14.9.0/zypp/sat/Solvable.h 2014-01-29 10:28:53.000000000
+0100
@@ -306,6 +306,9 @@
/** \relates Solvable More verbose stream output including dependencies */
std::ostream & dumpOn( std::ostream & str, const Solvable & obj );
+ /** \relates Solvable XML output */
+ std::ostream & dumpAsXmlOn( std::ostream & str, const Solvable & obj );
+
/** \relates Solvable */
inline bool operator==( const Solvable & lhs, const Solvable & rhs )
{ return lhs.get() == rhs.get(); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.8.0/zypp/target/TargetImpl.cc
new/libzypp-14.9.0/zypp/target/TargetImpl.cc
--- old/libzypp-14.8.0/zypp/target/TargetImpl.cc 2014-01-25
17:08:52.000000000 +0100
+++ new/libzypp-14.9.0/zypp/target/TargetImpl.cc 2014-01-29
10:28:53.000000000 +0100
@@ -1438,16 +1438,15 @@
}
else
{
- // if cache is preloaded, check for file conflicts
- commitFindFileConflicts( policy_r, result );
-
if ( ! policy_r.dryRun() )
{
+ // if cache is preloaded, check for file conflicts
+ commitFindFileConflicts( policy_r, result );
commit( policy_r, packageCache, result );
}
else
{
- DBG << "dryRun: Not installing/deleting anything." << endl;
+ DBG << "dryRun/downloadOnly: Not installing/deleting anything." <<
endl;
}
}
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
