- Don't pass epoch to 'rpm -e', it does not support it.

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 42491a6d8e6c380cdfe9a3e5598900675d60b9d8..17f6c451cbefaa8801cbd5e8c4f19755373f1dd0 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug  8 14:11:03 CEST 2008 - ma@suse.de
+
+- Don't pass epoch to 'rpm -e', it does not support it.
+- revision 10800
+
 -------------------------------------------------------------------
 Fri Aug  8 13:27:42 CEST 2008 - ma@suse.de
 

diff --git a/zypp/target/rpm/RpmDb.cc b/zypp/target/rpm/RpmDb.cc
index 64f8c13d9947e7e3346dbfc43e8d2c9f0db3a3a2..c662e5da3635b9bdbd1d5baf5a3f1d89bda5e3b5 100644 (file)
--- a/zypp/target/rpm/RpmDb.cc
+++ b/zypp/target/rpm/RpmDb.cc
@@ -1014,7 +1014,7 @@ void RpmDb::importPubkey( const PublicKey & pubkey_r )
         Date date = Date(str::strtonum<Date::ValueType>("0x" + (*it).release()));
         if (  date == pubkey_r.created() )
         {
-                
+
             MIL << endl << "Key " << pubkey_r << " is already in the rpm trusted keyring." << endl;
             return;
         }
@@ -1023,12 +1023,12 @@ void RpmDb::importPubkey( const PublicKey & pubkey_r )
             MIL << endl << "Key " << pubkey_r << " has another version in keyring. ( " << date << " & " << pubkey_r.created() << ")" << endl;
 
         }
-            
+
     }
   }
   // key does not exists, lets import it
   MIL <<  endl;
-    
+
   RpmArgVec opts;
   opts.push_back ( "--import" );
   opts.push_back ( "--" );
@@ -2093,8 +2093,10 @@ void RpmDb::doInstallPackage( const Pathname & filename, unsigned flags, callbac
 //
 void RpmDb::removePackage( Package::constPtr package, unsigned flags )
 {
+  // 'rpm -e' does not like epochs
   return removePackage( package->name()
-                        + "-" + package->edition().asString()
+                        + "-" + package->edition().version()
+                        + "-" + package->edition().release()
                         + "." + package->arch().asString(), flags );
 }