Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory checked
in at 2013-10-25 11:10:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2013-10-02
13:31:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2013-10-25
11:10:31.000000000 +0200
@@ -1,0 +2,30 @@
+Thu Oct 17 17:57:54 CEST 2013 - m...@suse.de
+
+- Add Package isCached and cachedLocation methods
+- fixed PluginFrame::hasKey
+- version 14.1.0 (0)
+
+-------------------------------------------------------------------
+Thu Oct 10 01:13:48 CEST 2013 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Sun Oct 6 01:13:51 CEST 2013 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Oct 3 01:14:59 CEST 2013 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Wed Oct 2 19:25:58 CEST 2013 - m...@suse.de
+
+- fix handling symlinks in export pathname on NFSv4 (bnc#804544)
+- Bump major version for Factory
+ 13.1 is continued on SuSE-Code-13_1-Branch
+- version 14.0.0 (0)
+
+-------------------------------------------------------------------
Old:
----
libzypp-13.7.0.tar.bz2
New:
----
libzypp-14.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.EfQV5r/_old 2013-10-25 11:10:32.000000000 +0200
+++ /var/tmp/diff_new_pack.EfQV5r/_new 2013-10-25 11:10:32.000000000 +0200
@@ -23,7 +23,7 @@
Summary: Package, Patch, Pattern, and Product Management
License: GPL-2.0+
Group: System/Packages
-Version: 13.7.0
+Version: 14.1.0
Release: 0
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
++++++ libzypp-13.7.0.tar.bz2 -> libzypp-14.1.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-13.7.0/VERSION.cmake
new/libzypp-14.1.0/VERSION.cmake
--- old/libzypp-13.7.0/VERSION.cmake 2013-09-18 17:09:43.000000000 +0200
+++ new/libzypp-14.1.0/VERSION.cmake 2013-10-17 18:01:43.000000000 +0200
@@ -58,11 +58,11 @@
# - Consider calling ./mkChangelog to assist you.
# See './mkChangelog -h' for help.
#
-SET(LIBZYPP_MAJOR "13")
-SET(LIBZYPP_COMPATMINOR "6")
-SET(LIBZYPP_MINOR "7")
+SET(LIBZYPP_MAJOR "14")
+SET(LIBZYPP_COMPATMINOR "0")
+SET(LIBZYPP_MINOR "1")
SET(LIBZYPP_PATCH "0")
#
-# LAST RELEASED: 13.7.0 (6)
+# LAST RELEASED: 14.1.0 (0)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-13.7.0/package/libzypp.changes
new/libzypp-14.1.0/package/libzypp.changes
--- old/libzypp-13.7.0/package/libzypp.changes 2013-09-29 01:20:02.000000000
+0200
+++ new/libzypp-14.1.0/package/libzypp.changes 2013-10-17 18:01:43.000000000
+0200
@@ -1,4 +1,34 @@
-------------------------------------------------------------------
+Thu Oct 17 17:57:54 CEST 2013 - m...@suse.de
+
+- Add Package isCached and cachedLocation methods
+- fixed PluginFrame::hasKey
+- version 14.1.0 (0)
+
+-------------------------------------------------------------------
+Thu Oct 10 01:13:48 CEST 2013 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Sun Oct 6 01:13:51 CEST 2013 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Oct 3 01:14:59 CEST 2013 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Wed Oct 2 19:25:58 CEST 2013 - m...@suse.de
+
+- fix handling symlinks in export pathname on NFSv4 (bnc#804544)
+- Bump major version for Factory
+ 13.1 is continued on SuSE-Code-13_1-Branch
+- version 14.0.0 (0)
+
+-------------------------------------------------------------------
Sun Sep 29 01:15:02 CEST 2013 - m...@suse.de
- Update zypp-po.tar.bz2
Files old/libzypp-13.7.0/po/zypp-po.tar.bz2 and
new/libzypp-14.1.0/po/zypp-po.tar.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-13.7.0/zypp/CheckSum.h
new/libzypp-14.1.0/zypp/CheckSum.h
--- old/libzypp-13.7.0/zypp/CheckSum.h 2013-03-20 09:29:30.000000000 +0100
+++ new/libzypp-14.1.0/zypp/CheckSum.h 2013-10-18 09:00:54.000000000 +0200
@@ -49,6 +49,13 @@
*/
CheckSum( const std::string & type, std::istream & input_r );
+#ifndef SWIG // Swig treats it as syntax error
+ /** Move Ctor */
+ CheckSum( const std::string & type, std::istream && input_r )
+ : CheckSum( type, input_r )
+ {}
+#endif
+
public:
static const std::string & md5Type();
static const std::string & shaType();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-13.7.0/zypp/Package.cc
new/libzypp-14.1.0/zypp/Package.cc
--- old/libzypp-13.7.0/zypp/Package.cc 2013-03-20 09:29:30.000000000 +0100
+++ new/libzypp-14.1.0/zypp/Package.cc 2013-10-17 18:01:43.000000000 +0200
@@ -9,6 +9,8 @@
/** \file zypp/Package.cc
*
*/
+#include <fstream>
+
#include "zypp/base/Logger.h"
#include "zypp/base/String.h"
#include "zypp/Package.h"
@@ -148,6 +150,43 @@
OnMediaLocation Package::location() const
{ return lookupLocation(); }
+ namespace
+ {
+ bool schemeIsLocalDir( const Url & url_r )
+ {
+ std::string s( url_r.getScheme() );
+ return s == "dir" || s == "file";
+ }
+ }
+
+ Pathname Package::cachedLocation() const
+ {
+ OnMediaLocation loc( location() );
+ PathInfo pi( repoInfo().packagesPath() / loc.filename() );
+
+ if ( ! pi.isExist() )
+ return Pathname(); // no file in cache
+
+ if ( loc.checksum().empty() )
+ {
+ Url url( repoInfo().url() );
+ if ( ! schemeIsLocalDir( url ) )
+ return Pathname(); // same name but no checksum to verify
+
+ // for local repos compare with the checksum in repo
+ if ( CheckSum( CheckSum::md5Type(), std::ifstream( (url.getPathName() /
loc.filename()).c_str() ) )
+ != CheckSum( CheckSum::md5Type(), std::ifstream( pi.c_str() ) ) )
+ return Pathname(); // same name but wrong checksum
+ }
+ else
+ {
+ if ( loc.checksum() != CheckSum( loc.checksum().type(), std::ifstream(
pi.c_str() ) ) )
+ return Pathname(); // same name but wrong checksum
+ }
+
+ return pi.path(); // the right one
+ }
+
std::string Package::sourcePkgName() const
{
// no id means same as package
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-13.7.0/zypp/Package.h
new/libzypp-14.1.0/zypp/Package.h
--- old/libzypp-13.7.0/zypp/Package.h 2013-03-20 09:29:30.000000000 +0100
+++ new/libzypp-14.1.0/zypp/Package.h 2013-10-17 18:01:43.000000000 +0200
@@ -122,6 +122,13 @@
*/
OnMediaLocation location() const;
+ /** Location of the downloaded package in cache or an empty path. */
+ Pathname cachedLocation() const;
+
+ /** Whether the package is cached. */
+ bool isCached() const
+ { return ! cachedLocation().empty(); }
+
protected:
friend Ptr make<Self>( const sat::Solvable & solvable_r );
/** Ctor */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-13.7.0/zypp/PluginFrame.h
new/libzypp-14.1.0/zypp/PluginFrame.h
--- old/libzypp-13.7.0/zypp/PluginFrame.h 2013-05-02 11:11:26.000000000
+0200
+++ new/libzypp-14.1.0/zypp/PluginFrame.h 2013-10-10 08:21:33.000000000
+0200
@@ -150,7 +150,7 @@
/** Whether the header list contains at least one entry for \c key_r. */
bool hasKey( const std::string & key_r ) const
- { return keyEmpty( key_r ); }
+ { return ! keyEmpty( key_r ); }
/** \overload */
bool keyEmpty( const std::string & key_r ) const
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
