Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory checked
in at 2012-10-23 19:39:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzypp (Old)
and /work/SRC/openSUSE:Factory/.libzypp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2012-09-25
10:41:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2012-10-23
19:39:33.000000000 +0200
@@ -1,0 +2,18 @@
+Sun Oct 7 01:13:41 CEST 2012 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Mon Oct 1 11:00:42 CEST 2012 - m...@suse.de
+
+- Enable multiversion kernel and set multiversion.kernels in
+ /etc/zypp/zypp.conf to keep the latest, latest-1 and the running.
+- Fix typo (bnc#782801)
+- Relax evaluation of patch category tags (case insensitive)
+
+-------------------------------------------------------------------
+Sun Sep 30 01:13:18 CEST 2012 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-12.2.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-12.2.0/package/libzypp.changes
new/libzypp-12.2.0/package/libzypp.changes
--- old/libzypp-12.2.0/package/libzypp.changes 2012-09-16 02:10:38.000000000
+0200
+++ new/libzypp-12.2.0/package/libzypp.changes 2012-10-15 15:57:59.000000000
+0200
@@ -1,4 +1,22 @@
-------------------------------------------------------------------
+Sun Oct 7 01:13:41 CEST 2012 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Mon Oct 1 11:00:42 CEST 2012 - m...@suse.de
+
+- Enable multiversion kernel and set multiversion.kernels in
+ /etc/zypp/zypp.conf to keep the latest, latest-1 and the running.
+- Fix typo (bnc#782801)
+- Relax evaluation of patch category tags (case insensitive)
+
+-------------------------------------------------------------------
+Sun Sep 30 01:13:18 CEST 2012 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
Sun Sep 16 01:14:34 CEST 2012 - m...@suse.de
- Update zypp-po.tar.bz2
Files old/libzypp-12.2.0/po/zypp-po.tar.bz2 and
new/libzypp-12.2.0/po/zypp-po.tar.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-12.2.0/zypp/Product.cc
new/libzypp-12.2.0/zypp/Product.cc
--- old/libzypp-12.2.0/zypp/Product.cc 2012-09-16 02:10:38.000000000 +0200
+++ new/libzypp-12.2.0/zypp/Product.cc 2012-10-15 15:57:59.000000000 +0200
@@ -11,6 +11,7 @@
*/
#include <iostream>
#include "zypp/base/LogTools.h"
+#include "zypp/base/StrMatcher.h"
#include "zypp/Product.h"
#include "zypp/Url.h"
@@ -94,6 +95,24 @@
found = *it;
}
}
+
+ if ( ! found && isSystem() )
+ {
+ // bnc#784900: for installed products check whether the file is owned by
+ // some package. If so, ust this as buddy.
+ sat::LookupAttr q( sat::SolvAttr::filelist, repository() );
+ std::string refFile( referenceFilename() );
+ if ( ! refFile.empty() )
+ {
+ StrMatcher matcher( referenceFilename() );
+ q.setStrMatcher( matcher );
+ if ( ! q.empty() )
+ found = q.begin().inSolvable();
+ }
+ else
+ INT << "Product referenceFilename unexpectedly empty!" << endl;
+ }
+
if ( ! found )
WAR << *this << ": no reference package found: " << identCap << endl;
return found;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-12.2.0/zypp/RepoInfo.cc
new/libzypp-12.2.0/zypp/RepoInfo.cc
--- old/libzypp-12.2.0/zypp/RepoInfo.cc 2012-09-16 02:10:38.000000000 +0200
+++ new/libzypp-12.2.0/zypp/RepoInfo.cc 2012-10-15 15:57:59.000000000 +0200
@@ -283,6 +283,34 @@
return ! licenseTgz.empty() && PathInfo(licenseTgz).isFile();
}
+ bool RepoInfo::needToAcceptLicense() const
+ {
+ static const std::string noAcceptanceFile = "no-acceptance-needed\n";
+ bool accept = true;
+
+ Pathname licenseTgz( _pimpl->licenseTgz() );
+ if ( licenseTgz.empty() || ! PathInfo( licenseTgz ).isFile() )
+ return false; // no licenses at all
+
+ ExternalProgram::Arguments cmd;
+ cmd.push_back( "tar" );
+ cmd.push_back( "-t" );
+ cmd.push_back( "-z" );
+ cmd.push_back( "-f" );
+ cmd.push_back( licenseTgz.asString() );
+
+ ExternalProgram prog( cmd, ExternalProgram::Stderr_To_Stdout );
+ for ( std::string output( prog.receiveLine() ); output.length(); output =
prog.receiveLine() )
+ {
+ if ( output == noAcceptanceFile )
+ {
+ accept = false;
+ }
+ }
+ MIL << "License for " << this->name() << " has to be accepted: " <<
(accept?"true":"false" ) << endl;
+ return accept;
+ }
+
std::string RepoInfo::getLicense( const Locale & lang_r )
{
LocaleSet avlocales( getLicenseLocales() );
@@ -351,10 +379,6 @@
else
ret.insert( Locale( std::string( output.c_str()+license.size(),
output.size()- license.size() - dotTxt.size() ) ) );
}
- else
- {
- WAR << " " << output;
- }
}
prog.close();
return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-12.2.0/zypp/RepoInfo.h
new/libzypp-12.2.0/zypp/RepoInfo.h
--- old/libzypp-12.2.0/zypp/RepoInfo.h 2012-09-16 02:10:38.000000000 +0200
+++ new/libzypp-12.2.0/zypp/RepoInfo.h 2012-10-15 15:57:59.000000000 +0200
@@ -309,6 +309,11 @@
/** Whether there is a license associated with the repo. */
bool hasLicense() const;
+ /** Whether the repo license has to be accepted, e.g. there is no
+ * no acceptance needed for openSUSE.
+ */
+ bool needToAcceptLicense() const;
+
/** Return the best license for the current (or a specified) locale. */
std::string getLicense( const Locale & lang_r = Locale() );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-12.2.0/zypp/ResObject.cc
new/libzypp-12.2.0/zypp/ResObject.cc
--- old/libzypp-12.2.0/zypp/ResObject.cc 2012-09-16 02:10:38.000000000
+0200
+++ new/libzypp-12.2.0/zypp/ResObject.cc 2012-10-15 15:57:59.000000000
+0200
@@ -75,6 +75,13 @@
return ret;
}
+ bool ResObject::needToAcceptLicense() const
+ {
+ if ( isKind<Product>() )
+ return repoInfo().needToAcceptLicense( );
+ return true;
+ }
+
std::string ResObject::distribution() const
{ return lookupStrAttribute( sat::SolvAttr::distribution ); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-12.2.0/zypp/ResObject.h
new/libzypp-12.2.0/zypp/ResObject.h
--- old/libzypp-12.2.0/zypp/ResObject.h 2012-09-16 02:10:38.000000000 +0200
+++ new/libzypp-12.2.0/zypp/ResObject.h 2012-10-15 15:57:59.000000000 +0200
@@ -130,6 +130,14 @@
*/
std::string licenseToConfirm( const Locale & lang_r = Locale() ) const;
+ /**
+ * \short Acceptance of Product License needed?
+ *
+ * Returns whether a product license has to be accepted
+ * (no acceptance is needed for openSUSE)
+ */
+ bool needToAcceptLicense() const;
+
/**
* \short Vendor
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-12.2.0/zypp/sat/Solvable.cc
new/libzypp-12.2.0/zypp/sat/Solvable.cc
--- old/libzypp-12.2.0/zypp/sat/Solvable.cc 2012-09-16 02:10:38.000000000
+0200
+++ new/libzypp-12.2.0/zypp/sat/Solvable.cc 2012-10-15 15:57:59.000000000
+0200
@@ -255,7 +255,7 @@
NO_SOLVABLE_RETURN( OnMediaLocation() );
// medianumber and path
unsigned medianr;
- char * file = ::solvable_get_location( _solvable, &medianr );
+ const char * file = ::solvable_get_location( _solvable, &medianr );
if ( ! file )
return OnMediaLocation();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-12.2.0/zypp.conf new/libzypp-12.2.0/zypp.conf
--- old/libzypp-12.2.0/zypp.conf 2012-09-16 02:10:38.000000000 +0200
+++ new/libzypp-12.2.0/zypp.conf 2012-10-15 15:57:59.000000000 +0200
@@ -361,7 +361,7 @@
## Default value:
## empty
##
-# multiversion = provides:multiversion(kernel)
+multiversion = provides:multiversion(kernel)
##
## Defining directory which may contain additional multiversion definitions.
@@ -391,7 +391,7 @@
## oldest+N - Keep kernel with the Nth lowest version number
##
## Default: Do not delete any kernels if multiversion =
provides:multiversion(kernel) is set
-# multiversion.kernels = latest,running
+multiversion.kernels = latest,latest-1,running
##
## Path to locks file. If not exist then is create.
@@ -403,7 +403,7 @@
# locksfile.path = /etc/zypp/locks
##
-## Whetever to apply locks in locks file after zypp start.
+## Whether to apply locks in locks file after zypp start.
##
## Valid values: boolean
## Default value: true
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
