Hello community,
here is the log from the commit of package libzypp
checked in at Tue Aug 28 19:10:50 CEST 2007.
--------
--- libzypp/libzypp.changes 2007-08-28 18:16:35.000000000 +0200
+++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2007-08-28 19:03:28.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Aug 28 18:48:26 CEST 2007 - dmacvicar@suse.de
+
+- (#297001) - libzypp: can't skip broken packages
+- re enable importing zypp keyring from rpm.(#302379)
+- 3.19.1
+
+-------------------------------------------------------------------
@@ -67 +74 @@
-Fri Aug 24 11:52:27 CEST 2007 - duncan@suse.de
+Fri Aug 24 11:52:27 CEST 2007 - dmacvicar@suse.de
@@ -611 +618 @@
-Wed Jul 18 14:16:59 CEST 2007 - duncan@suse.de
+Wed Jul 18 14:16:59 CEST 2007 - dmacvicar@suse.de
Old:
----
libzypp-3.19.0.tar.bz2
New:
----
libzypp-3.19.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.K28431/_old 2007-08-28 19:09:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K28431/_new 2007-08-28 19:09:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libzypp (Version 3.19.0)
+# spec file for package libzypp (Version 3.19.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,9 +16,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on
Summary: Package, Patch, Pattern, and Product Management
-Version: 3.19.0
+Version: 3.19.1
Release: 1
-Source: libzypp-3.19.0.tar.bz2
+Source: libzypp-3.19.1.tar.bz2
Source1: libzypp-rpmlintrc
Prefix: /usr
Provides: yast2-packagemanager
@@ -44,7 +44,7 @@
Ladislav Slezak
%package devel
-Requires: libzypp == 3.19.0
+Requires: libzypp == 3.19.1
Requires: libxml2-devel curl-devel openssl-devel rpm-devel glibc-devel zlib-devel
Requires: bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel
Requires: cmake
@@ -125,6 +125,10 @@
%{_libdir}/pkgconfig/libzypp.pc
%changelog
+* Tue Aug 28 2007 - dmacvicar@suse.de
+- (#297001) - libzypp: can't skip broken packages
+- re enable importing zypp keyring from rpm.(#302379)
+- 3.19.1
* Tue Aug 28 2007 - kkaempf@suse.de
- rename ResolvableQuery::iterateResolvablesByKindsAndStrings
to ResolvableQuery::iterateResolvablesByKindsAndStringsAndRepos
@@ -172,7 +176,7 @@
- filter out incompatible architectures when parsing sustags
repos (first half of #301286)
- r 6882
-* Fri Aug 24 2007 - duncan@suse.de
+* Fri Aug 24 2007 - dmacvicar@suse.de
- don't run source migration if yast is running in
intsys mode (#297136)
- signature and checksum verification fixes. Still pending
@@ -492,7 +496,7 @@
* Wed Jul 18 2007 - ma@suse.de
- Fixed IniParser to allow '=' in values (#292669)
- revision 6063
-* Wed Jul 18 2007 - duncan@suse.de
+* Wed Jul 18 2007 - dmacvicar@suse.de
- allow / in alias (#292628)
* Wed Jul 18 2007 - ma@suse.de
- Fixed repo::provideFile to throw on error.
++++++ libzypp-3.19.0.tar.bz2 -> libzypp-3.19.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.19.0/package/libzypp.changes new/libzypp-3.19.1/package/libzypp.changes
--- old/libzypp-3.19.0/package/libzypp.changes 2007-08-28 18:00:20.000000000 +0200
+++ new/libzypp-3.19.1/package/libzypp.changes 2007-08-28 19:03:01.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Aug 28 18:48:26 CEST 2007 - dmacvicar@suse.de
+
+- (#297001) - libzypp: can't skip broken packages
+- re enable importing zypp keyring from rpm.(#302379)
+- 3.19.1
+
+-------------------------------------------------------------------
Tue Aug 28 17:30:30 CEST 2007 - kkaempf@suse.de
- rename ResolvableQuery::iterateResolvablesByKindsAndStrings
@@ -11,7 +18,7 @@
- rev 6935
-------------------------------------------------------------------
-Tue Aug 28 11:27:53 CEST 2007 - duncan@suse.de
+Tue Aug 28 11:27:53 CEST 2007 - dmacvicar@suse.de
- real fix for reading signature ids. (#390535).
- delete metadata when removing repo (#301037).
@@ -64,7 +71,7 @@
- r 6882
-------------------------------------------------------------------
-Fri Aug 24 11:52:27 CEST 2007 - duncan@suse.de
+Fri Aug 24 11:52:27 CEST 2007 - dmacvicar@suse.de
- don't run source migration if yast is running in
intsys mode (#297136)
@@ -608,7 +615,7 @@
- revision 6058
-------------------------------------------------------------------
-Wed Jul 18 14:16:59 CEST 2007 - duncan@suse.de
+Wed Jul 18 14:16:59 CEST 2007 - dmacvicar@suse.de
- allow / in alias (#292628)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.19.0/tests/zypp/data/KeyRing/la/repomd.xml.asc new/libzypp-3.19.1/tests/zypp/data/KeyRing/la/repomd.xml.asc
--- old/libzypp-3.19.0/tests/zypp/data/KeyRing/la/repomd.xml.asc 1970-01-01 01:00:00.000000000 +0100
+++ new/libzypp-3.19.1/tests/zypp/data/KeyRing/la/repomd.xml.asc 2007-08-28 19:03:01.000000000 +0200
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.0.7 (GNU/Linux)
+
+iD8DBQBGyKpaOzARt2udZSMRAgqTAJ9HCea0aWyQ4kh6/qn4k03kTZK7pwCe
+IYNnvANI2W7Lm4YDck68InnF2Cc=
+=1JqC
+-----END PGP SIGNATURE-----
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.19.0/VERSION.cmake new/libzypp-3.19.1/VERSION.cmake
--- old/libzypp-3.19.0/VERSION.cmake 2007-08-28 18:00:21.000000000 +0200
+++ new/libzypp-3.19.1/VERSION.cmake 2007-08-28 19:03:01.000000000 +0200
@@ -47,4 +47,4 @@
SET(LIBZYPP_MAJOR "3")
SET(LIBZYPP_MINOR "19")
SET(LIBZYPP_COMPATMINOR "0")
-SET(LIBZYPP_PATCH "0")
+SET(LIBZYPP_PATCH "1")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.19.0/zypp/parser/yum/schema/validate-repodata.sh new/libzypp-3.19.1/zypp/parser/yum/schema/validate-repodata.sh
--- old/libzypp-3.19.0/zypp/parser/yum/schema/validate-repodata.sh 2007-08-28 18:00:20.000000000 +0200
+++ new/libzypp-3.19.1/zypp/parser/yum/schema/validate-repodata.sh 2007-08-28 19:03:01.000000000 +0200
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: validate-repodata.sh 5812 2007-06-20 13:30:06Z mvidner $
+# $Id$
set -o errexit
USAGE=false
DO_xmllint=false
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.19.0/zypp/repo/PackageProvider.cc new/libzypp-3.19.1/zypp/repo/PackageProvider.cc
--- old/libzypp-3.19.0/zypp/repo/PackageProvider.cc 2007-08-28 18:00:21.000000000 +0200
+++ new/libzypp-3.19.1/zypp/repo/PackageProvider.cc 2007-08-28 19:03:01.000000000 +0200
@@ -308,6 +308,9 @@
case repo::DownloadResolvableReport::IGNORE:
ZYPP_THROW(SkipRequestException("User requested skip of corrupted file"));
break;
+ case repo::DownloadResolvableReport::ABORT:
+ ZYPP_THROW(AbortRequestException("User requested to abort"));
+ break;
default:
break;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.19.0/zypp/repo/RepoProvideFile.cc new/libzypp-3.19.1/zypp/repo/RepoProvideFile.cc
--- old/libzypp-3.19.0/zypp/repo/RepoProvideFile.cc 2007-08-28 18:00:20.000000000 +0200
+++ new/libzypp-3.19.1/zypp/repo/RepoProvideFile.cc 2007-08-28 19:03:01.000000000 +0200
@@ -17,6 +17,7 @@
#include "zypp/base/Gettext.h"
#include "zypp/base/Logger.h"
#include "zypp/base/String.h"
+#include "zypp/base/UserRequestException.h"
#include "zypp/repo/RepoProvideFile.h"
#include "zypp/ZYppCallbacks.h"
#include "zypp/MediaSetAccess.h"
@@ -256,6 +257,16 @@
MIL << "provideFile at " << ret << endl;
return ret;
}
+ catch ( const SkipRequestException &e )
+ {
+ ZYPP_CAUGHT( e );
+ ZYPP_RETHROW(e);
+ }
+ catch ( const AbortRequestException &e )
+ {
+ ZYPP_CAUGHT( e );
+ ZYPP_RETHROW(e);
+ }
catch ( const Exception &e )
{
ZYPP_CAUGHT( e );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-3.19.0/zypp/target/rpm/RpmDb.cc new/libzypp-3.19.1/zypp/target/rpm/RpmDb.cc
--- old/libzypp-3.19.0/zypp/target/rpm/RpmDb.cc 2007-08-28 18:00:20.000000000 +0200
+++ new/libzypp-3.19.1/zypp/target/rpm/RpmDb.cc 2007-08-28 19:03:01.000000000 +0200
@@ -456,7 +456,7 @@
MIL << "Syncronizing keys with zypp keyring" << endl;
// we do this one by one now.
- //importZyppKeyRingTrustedKeys();
+ importZyppKeyRingTrustedKeys();
exportTrustedKeysInZyppKeyRing();
// Close the database in case any write acces (create/convert)
@@ -886,6 +886,40 @@
}
}
+void RpmDb::importZyppKeyRingTrustedKeys()
+{
+ MIL << "Importing zypp trusted keyring" << std::endl;
+
+ std::list<PublicKey> rpm_keys = pubkeys();
+
+ std::list<PublicKey> zypp_keys;
+
+ zypp_keys = getZYpp()->keyRing()->trustedPublicKeys();
+
+ for ( std::list<PublicKey>::const_iterator it = zypp_keys.begin(); it != zypp_keys.end(); ++it)
+ {
+ // we find only the left part of the long gpg key, as rpm does not support long ids
+ std::list<PublicKey>::iterator ik = find( rpm_keys.begin(), rpm_keys.end(), (*it));
+ if ( ik != rpm_keys.end() )
+ {
+ MIL << "Key " << (*it).id() << " (" << (*it).name() << ") is already in rpm database." << std::endl;
+ }
+ else
+ {
+ // now import the key in rpm
+ try
+ {
+ importPubkey((*it).path());
+ MIL << "Trusted key " << (*it).id() << " (" << (*it).name() << ") imported in rpm database." << std::endl;
+ }
+ catch (RpmException &e)
+ {
+ ERR << "Could not import key " << (*it).id() << " (" << (*it).name() << " from " << (*it).path() << " in rpm database" << std::endl;
+ }
+ }
+ }
+}
+
void RpmDb::exportTrustedKeysInZyppKeyRing()
{
MIL << "Exporting rpm keyring into zypp trusted keyring" <