[meego-commits] 14844: Changes to devel:packagemanagement/libzypp

[Zhang Qiang]

Hi,
I have made the following changes to libzypp in project devel:packagemanagement. Please review and accept ASAP.

Thank You,
Zhang Qiang

[This message was auto-generated]

---

Request #14844:

  submit:   home:xiaoqiang:branches:devel:packagemanagement/libzypp(r14)(cleanup) -> devel:packagemanagement/libzypp


Message:
    a

State:   new          2011-03-15T19:25:36 xiaoqiang
Comment: None



changes files:
--------------

new:
----
  MeeGo-Add-Rpm-Checker.patch

spec files:
-----------
--- libzypp.spec
+++ libzypp.spec
@@ -38,6 +38,7 @@
 Patch8:         MeeGo-support-none-proxy-from-repo.patch
 Patch9:         MeeGo-Add-armv7tnhl-and-armv7thl-architecture.patch
 Patch10:        MeeGo-dont-use-multcurl-by-default.patch
+Patch11:        MeeGo-Add-Rpm-Checker.patch
 
 %description
 Package, Patch, Pattern, and Product Management
@@ -90,6 +91,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 mkdir build

other changes:
--------------

++++++ MeeGo-Add-Rpm-Checker.patch (new)
--- MeeGo-Add-Rpm-Checker.patch
+++ MeeGo-Add-Rpm-Checker.patch
+diff -uNr libzypp-8.10.2/zypp/target/TargetImpl.cc libzypp-8.10.2.new/zypp/target/TargetImpl.cc
+--- libzypp-8.10.2/zypp/target/TargetImpl.cc	2011-03-03 15:01:01.459393761 +0800
++++ libzypp-8.10.2.new/zypp/target/TargetImpl.cc	2011-03-04 14:55:30.567593341 +0800
+@@ -38,12 +38,14 @@
+ #include "zypp/ExternalProgram.h"
+ #include "zypp/Repository.h"
+ 
++#include "zypp/FileChecker.h"
+ #include "zypp/ResFilters.h"
+ #include "zypp/HistoryLog.h"
+ #include "zypp/target/TargetImpl.h"
+ #include "zypp/target/TargetCallbackReceiver.h"
+ #include "zypp/target/rpm/librpmDb.h"
+ #include "zypp/target/CommitPackageCache.h"
++#include "zypp/target/rpm/RpmDb.h"
+ 
+ #include "zypp/parser/ProductFileReader.h"
+ 
+@@ -1301,6 +1303,19 @@
+ 
+             try
+             {
++              target::rpm::RpmDb::checkPackageResult res;
++              Target_Ptr target( getZYpp()->getTarget() );
++              res = target->rpmDb().checkPackage(localfile);
++
++              if (res == target::rpm::RpmDb::CHK_OK)
++                MIL << "Signature is OK" <<endl;
++              else if (res == target::rpm::RpmDb::CHK_NOTFOUND)
++                ZYPP_THROW( FileCheckException( localfile.value().asString() + " Signature is unknown type" ) );
++              else if (res == target::rpm::RpmDb::CHK_FAIL)
++                ZYPP_THROW( FileCheckException( localfile.value().asString() + " Signature does not verify" ) );
++              else if (res == target::rpm::RpmDb::CHK_NOKEY)
++                ZYPP_THROW( FileCheckException( localfile.value().asString() + " Public key is unavailable" ) );
++
+               progress.tryLevel( target::rpm::InstallResolvableReport::RPM_NODEPS_FORCE );
+               rpm().installPackage( localfile, flags );
+               HistoryLog().install(*it);
+@@ -1319,6 +1334,10 @@
+                 success = true;
+               }
+             }
++            catch ( const FileCheckException &e )
++            {
++              ZYPP_THROW(e);
++            }
+             catch ( Exception & excpt_r )
+             {
+               ZYPP_CAUGHT(excpt_r);