Author: mlandres Date: Fri Aug 8 14:12:28 2008 New Revision: 10800 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10800&view=rev Log: - Don't pass epoch to 'rpm -e', it does not support it. Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/target/rpm/RpmDb.cc Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=10800&r1=10799&r2=10800&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Aug 8 14:12:28 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +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 - Adapt to new product handling. Products are no longer pseudo Modified: trunk/libzypp/zypp/target/rpm/RpmDb.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmDb.cc?rev=10800&r1=10799&r2=10800&view=diff ============================================================================== --- trunk/libzypp/zypp/target/rpm/RpmDb.cc (original) +++ trunk/libzypp/zypp/target/rpm/RpmDb.cc Fri Aug 8 14:12:28 2008 @@ -1014,7 +1014,7 @@ Date date = Date(str::strtonumDate::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 @@ 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::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 ); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org