June 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10488 - in /trunk: libzypp/ libzypp/package/ libzypp/tests/zypp/ libzypp/zypp/ libzypp/zypp/sat/ sat-solver/package/ sat-solver/src/ sat-solver/tools/
by dmacvicar＠svn.opensuse.org 30 Jun '08

30 Jun '08

Author: dmacvicar Date: Tue Jul 1 00:00:15 2008 New Revision: 10488 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10488&view=rev Log: forward ports from 11.0 branch Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/tests/zypp/PublicKey_test.cc trunk/libzypp/zypp/PublicKey.cc trunk/libzypp/zypp/ResStatus.h trunk/libzypp/zypp/sat/SolvAttr.cc trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/src/knownid.h trunk/sat-solver/tools/repo_updateinfoxml.c Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10488&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Tue Jul 1 00:00:15 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_MINOR "0") SET(LIBZYPP_COMPATMINOR "0") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Tue Jul 1 00:00:15 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 30 23:55:20 CEST 2008 - dmacvicar(a)suse.de + +- forward port add message attribute to patches. +- version 5.0.2 + +------------------------------------------------------------------- Mon Jun 30 10:28:27 CEST 2008 - ma(a)suse.de - Fix permanent duplication of gpg keys in the rpm database. Also Modified: trunk/libzypp/tests/zypp/PublicKey_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/PublicKey_tes… ============================================================================== --- trunk/libzypp/tests/zypp/PublicKey_test.cc (original) +++ trunk/libzypp/tests/zypp/PublicKey_test.cc Tue Jul 1 00:00:15 2008 @@ -8,6 +8,7 @@ #include "zypp/base/Exception.h" #include "zypp/PublicKey.h" #include "zypp/TmpPath.h" +#include "zypp/Date.h" #include <boost/test/auto_unit_test.hpp> @@ -254,6 +255,7 @@ BOOST_CHECK_EQUAL( k2.id(), "A84EDAE89C800ACA" ); BOOST_CHECK_EQUAL( k2.name(), "SuSE Package Signing Key <build(a)suse.de>" ); BOOST_CHECK_EQUAL( k2.fingerprint(), "79C179B2E1C820C1890F9994A84EDAE89C800ACA" ); + BOOST_CHECK_EQUAL( k2.created(), zypp::Date(1087899198) ); BOOST_REQUIRE( k2.path() != Pathname() ); BOOST_REQUIRE( k2 == k2 ); // test for a empty key Modified: trunk/libzypp/zypp/PublicKey.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PublicKey.cc?rev=10… ============================================================================== --- trunk/libzypp/zypp/PublicKey.cc (original) +++ trunk/libzypp/zypp/PublicKey.cc Tue Jul 1 00:00:15 2008 @@ -217,10 +217,7 @@ PublicKey::PublicKey( const Pathname &file ) : _pimpl( new Impl(file) ) - { - MIL << *this << endl; - } - + {} /////////////////////////////////////////////////////////////////// // // METHOD NAME : PublicKey::~PublicKey Modified: trunk/libzypp/zypp/ResStatus.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResStatus.h?rev=104… ============================================================================== --- trunk/libzypp/zypp/ResStatus.h (original) +++ trunk/libzypp/zypp/ResStatus.h Tue Jul 1 00:00:15 2008 @@ -398,17 +398,17 @@ { if ( toTansact_r == transacts() ) { - // we're already in the desired state, but - // remember a superior causer. - if ( isLessThan<TransactByField>( causer_r ) ) + // we're already in the desired state, but in case of + // TRANSACT, remember a superior causer. + if ( transacts() && isLessThan<TransactByField>( causer_r ) ) fieldValueAssign<TransactByField>( causer_r ); fieldValueAssign<TransactDetailField>( NO_DETAIL ); // Details has to be set again return true; } // Here: transact status is to be changed: - if ( ! fieldValueIs<TransactField>( KEEP_STATE ) - && isGreaterThan<TransactByField>( causer_r ) ) { + if ( ! fieldValueIs<TransactField>( KEEP_STATE ) + && isGreaterThan<TransactByField>( causer_r ) ) { return false; } Modified: trunk/libzypp/zypp/sat/SolvAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.cc?rev… ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.cc (original) +++ trunk/libzypp/zypp/sat/SolvAttr.cc Tue Jul 1 00:00:15 2008 @@ -73,9 +73,7 @@ const SolvAttr SolvAttr::patchcategory ( SOLVABLE_PATCHCATEGORY ); const SolvAttr SolvAttr::rebootSuggested ( UPDATE_REBOOT ); const SolvAttr SolvAttr::restartSuggested ( UPDATE_RESTART ); -#warning fix if UPDATE_MESSAGE is ported to satsolver - const SolvAttr SolvAttr::message ( "update:message" /*UPDATE_MESSAGE*/ ); - + const SolvAttr SolvAttr::message ( UPDATE_MESSAGE ); const SolvAttr SolvAttr::updateCollectionName ( UPDATE_COLLECTION_NAME ); const SolvAttr SolvAttr::updateCollectionEvr ( UPDATE_COLLECTION_EVR ); const SolvAttr SolvAttr::updateCollectionArch ( UPDATE_COLLECTION_ARCH ); Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Tue Jul 1 00:00:15 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Jun 30 23:55:20 CEST 2008 - dmacvicar(a)suse.de + +- forward port +- add message tag to updateinfo.xml for displaying + messages in the user interface +- Fix missing self provides for patches (bnc #397132). + +------------------------------------------------------------------- Mon Jun 2 11:47:32 CEST 2008 - coolo(a)suse.de - calculate recommendation list also if ignorealreadyrecommended is set, Modified: trunk/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/knownid.h?rev=104… ============================================================================== --- trunk/sat-solver/src/knownid.h (original) +++ trunk/sat-solver/src/knownid.h Tue Jul 1 00:00:15 2008 @@ -126,6 +126,7 @@ KNOWNID(UPDATE_REBOOT, "update:reboot"), /* reboot suggested (kernel update) */ KNOWNID(UPDATE_RESTART, "update:restart"), /* restart suggested (update stack update) */ +KNOWNID(UPDATE_MESSAGE, "update:message"), /* restart suggested (update stack update) */ /* 'content' of patch, usually list of packages */ KNOWNID(UPDATE_COLLECTION, "update:collection"), /* "name evr arch" */ KNOWNID(UPDATE_COLLECTION_NAME, "update:collection:name"), /* name */ Modified: trunk/sat-solver/tools/repo_updateinfoxml.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_updateinfo… ============================================================================== --- trunk/sat-solver/tools/repo_updateinfoxml.c (original) +++ trunk/sat-solver/tools/repo_updateinfoxml.c Tue Jul 1 00:00:15 2008 @@ -53,16 +53,17 @@ STATE_TITLE, /* 4 */ STATE_RELEASE, /* 5 */ STATE_ISSUED, /* 6 */ - STATE_REFERENCES, /* 7 */ - STATE_REFERENCE, /* 8 */ - STATE_DESCRIPTION, /* 9 */ - STATE_PKGLIST, /* 10 */ - STATE_COLLECTION, /* 11 */ - STATE_NAME, /* 12 */ - STATE_PACKAGE, /* 13 */ - STATE_FILENAME, /* 14 */ - STATE_REBOOT, /* 15 */ - STATE_RESTART, /* 16 */ + STATE_MESSAGE, /* 7 */ + STATE_REFERENCES, /* 8 */ + STATE_REFERENCE, /* 9 */ + STATE_DESCRIPTION, /* 10 */ + STATE_PKGLIST, /* 11 */ + STATE_COLLECTION, /* 12 */ + STATE_NAME, /* 13 */ + STATE_PACKAGE, /* 14 */ + STATE_FILENAME, /* 15 */ + STATE_REBOOT, /* 16 */ + STATE_RESTART, /* 17 */ NUMSTATES }; @@ -84,6 +85,7 @@ { STATE_UPDATE, "release", STATE_RELEASE, 1 }, { STATE_UPDATE, "issued", STATE_ISSUED, 1 }, { STATE_UPDATE, "description", STATE_DESCRIPTION, 1 }, + { STATE_UPDATE, "message", STATE_MESSAGE , 1 }, { STATE_UPDATE, "references", STATE_REFERENCES, 0 }, { STATE_UPDATE, "pkglist", STATE_PKGLIST, 0 }, { STATE_REFERENCES, "reference", STATE_REFERENCE, 0 }, @@ -111,6 +113,7 @@ Solvable *solvable; unsigned int timestamp; + struct stateswitch *swtab[NUMSTATES]; enum state sbtab[NUMSTATES]; char *tempstr; @@ -122,6 +125,7 @@ * if we have seen a <filename>... * inside of <package>... * + * * If not, we must insert an empty filename to UPDATE_COLLECTION_FILENAME * at </package> in order to keep all UPDATE_COLLECTION_* arrays in sync */ @@ -242,6 +246,7 @@ if (!strcmp(sw->ename, name)) break; + if (sw->from != pd->state) { #if 1 @@ -283,11 +288,14 @@ version = atts[1]; } + solvable = pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->repo)); pd->datanum = (pd->solvable - pool->solvables) - pd->repo->start; repodata_extend(pd->data, pd->solvable - pool->solvables); + repodata_extend(pd->data, pd->solvable - pool->solvables); pd->datanum = repodata_get_handle(pd->data, pd->datanum); + solvable->vendor = str2id(pool, from, 1); solvable->evr = str2id(pool, version, 1); solvable->arch = ARCH_NOARCH; @@ -348,6 +356,9 @@ /* <description>This update ...</description> */ case STATE_DESCRIPTION: break; + /* <message type="confirm">This update ...</message> */ + case STATE_MESSAGE: + break; case STATE_PKGLIST: break; /* <collection short="F8"> */ @@ -360,6 +371,7 @@ * src="http://download.fedoraproject.org/pub/fedora/linux/updates/8/ppc64/imlib-de…" * version="1.9.15"> * + * * -> patch.conflicts: {name} < {version}.{release} */ case STATE_PACKAGE: @@ -369,10 +381,12 @@ Id n, a, na; Id rel_id; + /* reset package_* markers, to be evaluated at </package> */ package_filename_seen = 0; package_flags = 0; + for (; *atts; atts += 2) { if (!strcmp(*atts, "arch")) @@ -391,6 +405,7 @@ /* now combine both to a single Id */ na = rel2id(pool, n, a, REL_ARCH, 1); + rel_id = rel2id(pool, na, evr, REL_LT, 1); solvable->conflicts = repo_addid_dep(pd->repo, solvable->conflicts, rel_id, 0); @@ -415,6 +430,7 @@ } break; /* <filename>libntlm-0.4.2-1.fc8.x86_64.rpm</filename> */ + /* <filename>libntlm-0.4.2-1.fc8.x86_64.rpm</filename> */ case STATE_FILENAME: break; /* <reboot_suggested>True</reboot_suggested> */ @@ -439,6 +455,7 @@ struct parsedata *pd = userData; Pool *pool = pd->pool; Solvable *s = pd->solvable; + Repo *repo = pd->repo; #if 0 fprintf(stderr, "end: %s\n", name); @@ -461,6 +478,7 @@ case STATE_UPDATES: break; case STATE_UPDATE: + s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); break; case STATE_ID: { @@ -500,6 +518,15 @@ repodata_set_str(pd->data, pd->datanum, SOLVABLE_DESCRIPTION, pd->content); } break; + break; + /* + * <message>Warning! ...</message> + */ + case STATE_MESSAGE: + { + repodata_set_str(pd->data, pd->datanum, UPDATE_MESSAGE, pd->content); + } + break; case STATE_PKGLIST: break; case STATE_COLLECTION: @@ -521,6 +548,7 @@ } break; /* <filename>libntlm-0.4.2-1.fc8.x86_64.rpm</filename> */ + /* <filename>libntlm-0.4.2-1.fc8.x86_64.rpm</filename> */ case STATE_FILENAME: { #if DO_ARRAY @@ -562,6 +590,7 @@ pd->state = pd->sbtab[pd->state]; pd->docontent = 0; + return; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10487 - in /trunk/libzypp: package/libzypp.changes zypp/KeyRing.cc zypp/PublicKey.cc zypp/PublicKey.h zypp/base/String.h zypp/target/rpm/RpmDb.cc
by mlandres＠svn.opensuse.org 30 Jun '08

30 Jun '08

Author: mlandres Date: Mon Jun 30 10:30:02 2008 New Revision: 10487 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10487&view=rev Log: - Fix permanent duplication of gpg keys in the rpm database. Also retrieve correct creation and expire dates. (bnc #401259) - Invoke gpg with --homdir, otherwise command fails if executed within a wrapper. (bnc #401259) Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/KeyRing.cc trunk/libzypp/zypp/PublicKey.cc trunk/libzypp/zypp/PublicKey.h trunk/libzypp/zypp/base/String.h 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?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Jun 30 10:30:02 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Jun 30 10:28:27 CEST 2008 - ma(a)suse.de + +- Fix permanent duplication of gpg keys in the rpm database. Also + retrieve correct creation and expire dates. (bnc #401259) +- Invoke gpg with --homdir, otherwise command fails if executed + within a wrapper. (bnc #401259) +- revision 10487 + +------------------------------------------------------------------- Thu Jun 26 12:07:33 CEST 2008 - schubi(a)suse.de - version 5.0.1 Modified: trunk/libzypp/zypp/KeyRing.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/KeyRing.cc?rev=1048… ============================================================================== --- trunk/libzypp/zypp/KeyRing.cc (original) +++ trunk/libzypp/zypp/KeyRing.cc Mon Jun 30 10:30:02 2008 @@ -249,6 +249,7 @@ for (list<PublicKey>::const_iterator it = keys.begin(); it != keys.end(); it++) { if ( id == (*it).id() ) + return true; } return false; @@ -339,6 +340,19 @@ { PublicKey key = exportKey( id, trustedKeyRing() ); + // lets look if there is an updated key in the + // general keyring + if ( publicKeyExists( id, generalKeyRing() ) ) + { + PublicKey untkey = exportKey( id, generalKeyRing() ); + if ( untkey.created() > key.created() ) + { + MIL << "Key " << key << " was updated. Saving new version into trusted keyring." << endl; + importKey( untkey, true ); + key = untkey; + } + } + MIL << "Key " << id << " " << key.name() << " is trusted" << endl; // it exists, is trusted, does it validates? if ( verifyFile( file, signature, trustedKeyRing() ) ) Modified: trunk/libzypp/zypp/PublicKey.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PublicKey.cc?rev=10… ============================================================================== --- trunk/libzypp/zypp/PublicKey.cc (original) +++ trunk/libzypp/zypp/PublicKey.cc Mon Jun 30 10:30:02 2008 @@ -10,6 +10,7 @@ * */ #include <iostream> +#include <vector> //#include "zypp/base/Logger.h" @@ -22,6 +23,7 @@ #include "zypp/base/Exception.h" #include "zypp/base/Logger.h" #include "zypp/Date.h" +#include "zypp/TmpPath.h" #include <ctime> @@ -29,7 +31,7 @@ /////////////////////////////////////////////////////////////////// namespace zypp -{ ///////////////////////////////////////////////////////////////// +{ ///////////////////////////////////////////////////////////////// // // CLASS NAME : PublicKey::Impl // @@ -44,7 +46,7 @@ readFromFile(file); MIL << "Done reading key" << std::endl; } - + public: /** Offer default Impl. */ static shared_ptr<Impl> nullimpl() @@ -53,21 +55,21 @@ return _nullimpl; } - + std::string asString() const { - return "[" + id() + "] [" + name() + "] [" + fingerprint() + "]"; + return "[" + id() + "-" + str::hexstring(created(),8).substr(2) + "] [" + name() + "] [" + fingerprint() + "]"; } - + std::string armoredData() const { return _data; } - + std::string id() const { return _id; } - + std::string name() const { return _name; } - + std::string fingerprint() const { return _fingerprint; } @@ -76,68 +78,37 @@ Date expires() const { return _expires; } - + Pathname path() const - { + { return _data_file.path(); //return _data_file; } - - protected: - // create Date from a string in format YYYY-MM-DD - Date createDate(const std::string &datestr) - { - // empty input - if (datestr.empty()) - { - return Date(); - } - - tm date; - memset(&date, 0, sizeof(date)); - - try - { - // set the date - date.tm_year = str::strtonum<int>(std::string(datestr, 0, 4)) - 1900; // years since 1900 - date.tm_mon = str::strtonum<int>(std::string(datestr, 5, 2)) - 1; // months since January - date.tm_mday = str::strtonum<int>(std::string(datestr, 9, 2)); // day - } - catch(...) - { - WAR << "Cannot parse date string: " << datestr << std::endl; - return Date(); - } - - time_t time_epoch = ::mktime(&date); + protected: - return Date(time_epoch); - } - void readFromFile( const Pathname &keyfile) { - static str::regex rxColons("^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):([^:]*):\n$"); - + PathInfo info(keyfile); - MIL << "Reading pubkey from " << keyfile << " of size " << info.size() << " and sha1 " << filesystem::checksum(keyfile, "sha1")<< endl; + MIL << "Reading pubkey from " << keyfile << " of size " << info.size() << " and sha1 " << filesystem::checksum(keyfile, "sha1")<< endl; if ( !info.isExist() ) ZYPP_THROW(Exception("Can't read public key from " + keyfile.asString() + ", file not found")); - + if ( copy( keyfile, _data_file.path() ) != 0 ) ZYPP_THROW(Exception("Can't copy public key data from " + keyfile.asString() + " to " + _data_file.path().asString() )); - - filesystem::TmpDir dir; - + filesystem::TmpDir dir; const char* argv[] = { "gpg", + "-v", "--no-default-keyring", - "--homedir", - dir.path().asString().c_str(), + "--fixed-list-mode", "--with-fingerprint", "--with-colons", + "--homedir", + dir.path().asString().c_str(), "--quiet", "--no-tty", "--no-greeting", @@ -147,42 +118,77 @@ _data_file.path().asString().c_str(), NULL }; - + ExternalProgram prog(argv,ExternalProgram::Discard_Stderr, false, -1, true); - + std::string line; - int count = 0; - - // pub:-:1024:17:A84EDAE89C800ACA:2000-10-19:2008-06-21::-:SuSE Package Signing Key <build(a)suse.de>: - - for(line = prog.receiveLine(), count=0; !line.empty(); line = prog.receiveLine(), count++ ) + bool sawpub = false; + bool sawsig = false; + + // pub:-:1024:17:A84EDAE89C800ACA:971961473:1214043198::-:SuSE Package Signing Key <build(a)suse.de>: + // fpr:::::::::79C179B2E1C820C1890F9994A84EDAE89C800ACA: + // sig:::17:A84EDAE89C800ACA:1087899198:::::[selfsig]::13x: + // sig:::17:9E40E310000AABA4:980442706::::[User ID not found]:10x: + // sig:::1:77B2E6003D25D3D9:980443247::::[User ID not found]:10x: + // sub:-:2048:16:197448E88495160C:971961490:1214043258::: [expires: 2008-06-21] + // sig:::17:A84EDAE89C800ACA:1087899258:::::[keybind]::18x: + + for ( line = prog.receiveLine(); !line.empty(); line = prog.receiveLine() ) { - //MIL << "[" << line << "]" << std::endl; - str::smatch what; - if(str::regex_match(line, what, rxColons)) + // trim trailing NL. + if ( line.empty() ) + continue; + if ( line[line.size()-1] == '\n' ) + line.erase( line.size()-1 ); + + // split at ':' + std::vector<std::string> words; + str::splitFields( line, std::back_inserter(words), ":" ); + if( words.empty() ) + continue; + + if ( words[0] == "pub" ) { - if ( what[1] == "pub" ) - { - _id = what[5]; - //replace all escaped semicolon with real - _name = str::gsub(what[10],"\\x3a",":"); - _created = createDate(what[6]); - _expires = createDate(what[7]); - //return key; - } - else if ( what[1] == "fpr" ) - { - _fingerprint = what[10]; - } - //dumpRegexpResults(what); + if ( sawpub ) + continue; + sawpub = true; + // take default from pub + _id = words[4]; + _name = words[9]; + _created = Date(str::strtonum<Date::ValueType>(words[5])); + _expires = Date(str::strtonum<Date::ValueType>(words[6])); + + } + else if ( words[0] == "sig" ) + { + if ( sawsig || words[words.size()-2] != "13x" ) + continue; + sawsig = true; + // update creation and expire dates from 1st signature type "13x" + if ( ! words[5].empty() ) + _created = Date(str::strtonum<Date::ValueType>(words[5])); + if ( ! words[6].empty() ) + _expires = Date(str::strtonum<Date::ValueType>(words[6])); + } + else if ( words[0] == "fpr" ) + { + _fingerprint = words[9]; + } + else if ( words[0] == "uid" ) + { + if ( ! words[9].empty() ) + _name = words[9]; } } prog.close(); - - if (_id.size() == 0 ) - ZYPP_THROW(BadKeyException("File " + keyfile.asString() + " doesn't contain public key data" , keyfile)); + + if ( _id.size() == 0 ) + ZYPP_THROW( BadKeyException( "File " + keyfile.asString() + " doesn't contain public key data" , keyfile ) ); + + //replace all escaped semicolon with real ':' + str::replaceAll( _name, "\\x3a", ":" ); } - + private: std::string _id; std::string _name; @@ -211,7 +217,10 @@ PublicKey::PublicKey( const Pathname &file ) : _pimpl( new Impl(file) ) - {} + { + MIL << *this << endl; + } + /////////////////////////////////////////////////////////////////// // // METHOD NAME : PublicKey::~PublicKey @@ -230,16 +239,16 @@ { return _pimpl->asString(); } - + std::string PublicKey::armoredData() const { return _pimpl->armoredData(); } - + std::string PublicKey::id() const { return _pimpl->id(); } - + std::string PublicKey::name() const { return _pimpl->name(); } - + std::string PublicKey::fingerprint() const { return _pimpl->fingerprint(); } @@ -248,20 +257,33 @@ Date PublicKey::expires() const { return _pimpl->expires(); } - + Pathname PublicKey::path() const { return _pimpl->path(); } bool PublicKey::operator==( PublicKey b ) const { - return (b.id() == id()) && (b.fingerprint() == fingerprint() ); + return ( b.id() == id() + && b.fingerprint() == fingerprint() + && b.created() == created() ); } - + bool PublicKey::operator==( std::string sid ) const { return sid == id(); } - + + std::ostream & dumpOn( std::ostream & str, const PublicKey & obj ) + { + str << "[" << obj.name() << "]" << endl; + str << " fpr " << obj.fingerprint() << endl; + str << " id " << obj.id() << endl; + str << " cre " << obj.created() << endl; + str << " exp " << obj.expires() << endl; + str << "]"; + return str; + } + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/PublicKey.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PublicKey.h?rev=104… ============================================================================== --- trunk/libzypp/zypp/PublicKey.h (original) +++ trunk/libzypp/zypp/PublicKey.h Mon Jun 30 10:30:02 2008 @@ -25,7 +25,7 @@ /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// - + /** * Exception thrown when the supplied key is * not a valid gpg key @@ -39,10 +39,10 @@ BadKeyException() : Exception( "Bad Key Exception" ) {} - + Pathname keyFile() const { return _keyfile; } - + /** Ctor taking message. * Use \ref ZYPP_THROW to throw exceptions. */ @@ -54,16 +54,16 @@ private: Pathname _keyfile; }; - - // forward declaration of class Date + + // forward declaration of class Date class Date; /////////////////////////////////////////////////////////////////// // // CLASS NAME : PublicKey // - /** + /** * Class that represent a GPG Public Key */ class PublicKey @@ -76,16 +76,16 @@ public: PublicKey(); - /** Ctor + /** Ctor * \throws when data does not make a key */ PublicKey(const Pathname &file); - + ~PublicKey(); - + bool isValid() const { return ( ! id().empty() && ! fingerprint().empty() && !path().empty() ); } - + std::string asString() const; std::string armoredData() const; std::string id() const; @@ -94,7 +94,7 @@ /** * Date when the key was created (time is 00:00:00) - */ + */ Date created() const; /** @@ -103,11 +103,11 @@ */ Date expires() const; - Pathname path() const; - + Pathname path() const; + bool operator==( PublicKey b ) const; bool operator==( std::string sid ) const; - + private: /** Pointer to implementation */ RWCOW_pointer<Impl> _pimpl; @@ -118,7 +118,10 @@ inline std::ostream & operator<<( std::ostream & str, const PublicKey & obj ) { return str << obj.asString(); } - ///////////////////////////////////////////////////////////////// + /** \relates PublicKey Detailed stream output */ + std::ostream & dumpOn( std::ostream & str, const PublicKey & obj ); + + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// #endif // ZYPP_PUBLICKEY_H Modified: trunk/libzypp/zypp/base/String.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/String.h?rev=1… ============================================================================== --- trunk/libzypp/zypp/base/String.h (original) +++ trunk/libzypp/zypp/base/String.h Mon Jun 30 10:30:02 2008 @@ -439,6 +439,57 @@ } return ret; } + + /** Split \a line_r into fields. + * Any single character in \a sepchars_r is treated as a + * field separator. The words are passed to OutputIterator + * \a result_r. + * \code + * "" -> words 0 + * ":" -> words 2 ||| + * "a" -> words 1 |a| + * ":a" -> words 2 ||a| + * "a:" -> words 2 |a|| + * ":a:" -> words 3 ||a|| + * + * \endcode + * + * \code + * std::vector<std::string> words; + * str::split( "some line", std::back_inserter(words) ) + * \endcode + * + */ + template<class _OutputIterator> + unsigned splitFields( const C_Str & line_r, + _OutputIterator result_r, + const C_Str & sepchars_r = ":" ) + { + const char * beg = line_r; + const char * cur = beg; + unsigned ret = 0; + for ( beg = cur; *beg; beg = cur, ++result_r ) + { + // skip non sepchars + while( *cur && !::strchr( sepchars_r, *cur ) ) + ++cur; + // build string + *result_r = std::string( beg, cur-beg ); + ++ret; + // skip sepchar + if ( *cur ) + { + ++cur; + if ( ! *cur ) // ending with sepchar + { + *result_r = std::string(); // add final empty field + ++ret; + break; + } + } + } + return ret; + } //@} /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/target/rpm/RpmDb.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmDb.cc… ============================================================================== --- trunk/libzypp/zypp/target/rpm/RpmDb.cc (original) +++ trunk/libzypp/zypp/target/rpm/RpmDb.cc Mon Jun 30 10:30:02 2008 @@ -1001,21 +1001,34 @@ // check if the key is already in the rpm database and just // return if it does. set<Edition> rpm_keys = pubkeyEditions(); + string keyshortid = pubkey_r.id().substr(8,8); + MIL << "Comparing '" << keyshortid << "' to: "; for ( set<Edition>::const_iterator it = rpm_keys.begin(); it != rpm_keys.end(); ++it) { string id = str::toUpper( (*it).version() ); - string keyshortid = pubkey_r.id().substr(8,8); - MIL << "Comparing '" << id << "' to '" << keyshortid << "'" << endl; + MIL << ", '" << id << "'"; if ( id == keyshortid ) { - // they match id - // FIXME id is not sufficient? - MIL << "Key " << pubkey_r << " is already in the rpm trusted keyring." << endl; - return; + // they match id + // now check if timestamp is different + 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; + } + else + { + 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 ( "--" ); @@ -2097,17 +2110,28 @@ report->start( name_r ); - try - { - doRemovePackage(name_r, flags, report); - } - catch (RpmException & excpt_r) - { - report->problem(excpt_r); //! partial fix to bug #388810, \todo allow to abort/retry failed rpm removal - report->finish(excpt_r); - ZYPP_RETHROW(excpt_r); - } - report->finish(); + do + try + { + doRemovePackage(name_r, flags, report); + report->finish(); + break; + } + catch (RpmException & excpt_r) + { + RpmRemoveReport::Action user = report->problem( excpt_r ); + + if ( user == RpmRemoveReport::ABORT ) + { + report->finish( excpt_r ); + ZYPP_RETHROW(excpt_r); + } + else if ( user == RpmRemoveReport::IGNORE ) + { + break; + } + } + while (true); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10486 - /trunk/libzypp/zypp/ZYppCallbacks.h
by jkupec＠svn.opensuse.org 29 Jun '08

29 Jun '08

Author: jkupec Date: Sun Jun 29 13:43:41 2008 New Revision: 10486 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10486&view=rev Log: - pass by reference (sync with 11.0 branch) Modified: trunk/libzypp/zypp/ZYppCallbacks.h Modified: trunk/libzypp/zypp/ZYppCallbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYppCallbacks.h?rev… ============================================================================== --- trunk/libzypp/zypp/ZYppCallbacks.h (original) +++ trunk/libzypp/zypp/ZYppCallbacks.h Sun Jun 29 13:43:41 2008 @@ -405,7 +405,7 @@ /** Display \c patch->message(). * Return \c true to continue, \c false to abort commit. */ - virtual bool show( Patch::constPtr /*patch*/ ) + virtual bool show( Patch::constPtr & /*patch*/ ) { return true; } }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10485 - in /trunk/libzypp/devel/devel.jkupec: CMakeLists.txt repos.cc
by jkupec＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: jkupec Date: Fri Jun 27 16:58:32 2008 New Revision: 10485 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10485&view=rev Log: - backup Added: trunk/libzypp/devel/devel.jkupec/repos.cc (with props) Modified: trunk/libzypp/devel/devel.jkupec/CMakeLists.txt Modified: trunk/libzypp/devel/devel.jkupec/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.jkupec/CMake… ============================================================================== --- trunk/libzypp/devel/devel.jkupec/CMakeLists.txt (original) +++ trunk/libzypp/devel/devel.jkupec/CMakeLists.txt Fri Jun 27 16:58:32 2008 @@ -15,18 +15,20 @@ bridge/Derived.h ) -#ADD_EXECUTABLE( yumparsertest YUMParser_test.cc ) -#TARGET_LINK_LIBRARIES( yumparsertest zypp ) +#ADD_EXECUTABLE( bridge ${bridge_SRCS} ) +#TARGET_LINK_LIBRARIES( bridge zypp ) + +#ADD_EXECUTABLE( deltarpm deltarpm.cc ) +#TARGET_LINK_LIBRARIES( deltarpm zypp ) -ADD_EXECUTABLE( bridge ${bridge_SRCS} ) -TARGET_LINK_LIBRARIES( bridge zypp ) +#ADD_EXECUTABLE( pathinfo pathinfo.cc ) +#TARGET_LINK_LIBRARIES( pathinfo zypp ) ADD_EXECUTABLE( poolquery poolquery.cc ) TARGET_LINK_LIBRARIES( poolquery zypp ) -ADD_EXECUTABLE( pathinfo pathinfo.cc ) -TARGET_LINK_LIBRARIES( pathinfo zypp ) - -ADD_EXECUTABLE( deltarpm deltarpm.cc ) -TARGET_LINK_LIBRARIES( deltarpm zypp ) +ADD_EXECUTABLE( repos repos.cc ) +TARGET_LINK_LIBRARIES( repos zypp ) +#ADD_EXECUTABLE( yumparsertest YUMParser_test.cc ) +#TARGET_LINK_LIBRARIES( yumparsertest zypp ) Added: trunk/libzypp/devel/devel.jkupec/repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.jkupec/repos… ============================================================================== --- trunk/libzypp/devel/devel.jkupec/repos.cc (added) +++ trunk/libzypp/devel/devel.jkupec/repos.cc Fri Jun 27 16:58:32 2008 @@ -0,0 +1,61 @@ +#include <stdio.h> +#include <iostream> +#include <iterator> +#include <list> + +#include "zypp/ZYppFactory.h" +#include "zypp/RepoInfo.h" +#include "zypp/Arch.h" +#include "zypp/Pathname.h" +#include "zypp/RepoManager.h"; + +using std::cout; +using std::endl; +using std::string; +using namespace zypp; + + +bool result_cb( const sat::Solvable & solvable ) +{ + zypp::PoolItem pi( zypp::ResPool::instance().find( solvable ) ); + cout << pi.resolvable() << endl; + // name: yast2-sound 2.16.2-9 i586 + return true; +} + + +static void init_pool() +{ + Pathname dir(TESTS_SRC_DIR); + dir += "/zypp/data/PoolQuery"; + + ZYpp::Ptr z = getZYpp(); + ZConfig::instance().setSystemArchitecture(Arch("i586")); + + RepoInfo i1; i1.setAlias("factory"); + sat::Pool::instance().addRepoSolv(dir / "factory.solv", i1); + RepoInfo i2; i2.setAlias("factory-nonoss"); + sat::Pool::instance().addRepoSolv(dir / "factory-nonoss.solv", i2); + RepoInfo i3; i3.setAlias("zypp_svn"); + sat::Pool::instance().addRepoSolv(dir / "zypp_svn.solv", i3); + RepoInfo i4; i4.setAlias("@System"); + sat::Pool::instance().addRepoSolv(dir / "@System.solv", i4); +} + + +int main (int argc, const char ** argv) +{ + string _target_root = "/local/jkupec/rr"; + + RepoManagerOptions repo_options(_target_root); + // repo_options.knownReposPath = Pathname(_target_root) + repo_options.knownReposPath; + + RepoManager rm(repo_options); + + std::list<RepoInfo> repos = rm.knownRepositories(); + for ( std::list<RepoInfo>::const_iterator it = repos.begin(); + it != repos.end(); ++it ) + { + cout << it->packagesPath() << endl; + } +} -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10484 - in /branches/SuSE-SLE-10-SP2-Branch/libzypp: VERSION package/libzypp.changes zypp/PublicKey.cc
by mlandres＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: mlandres Date: Fri Jun 27 16:58:19 2008 New Revision: 10484 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10484&view=rev Log: Invoke gpg with --homdir Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/PublicKey.cc Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzyp… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/VERSION Fri Jun 27 16:58:19 2008 @@ -49,5 +49,5 @@ m4_define([LIBZYPP_MINOR], [32]) m4_define([LIBZYPP_COMPATMINOR], [15]) dnl ================================================== -m4_define([LIBZYPP_PATCH], [0]) +m4_define([LIBZYPP_PATCH], [1]) dnl ================================================== Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzyp… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/package/libzypp.changes Fri Jun 27 16:58:19 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jun 27 16:16:50 CEST 2008 - ma(a)suse.de + +- Invoke gpg with --homdir, otherwise command fails if executed + within a wrapper. (bnc #401259) +- version 2.32.1 +- revision 10484 + +------------------------------------------------------------------- Thu Jun 26 12:26:11 CEST 2008 - ma(a)suse.de - Import newer gpg keys if a trusted key is updated Modified: branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/PublicKey.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/libzyp… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/PublicKey.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/libzypp/zypp/PublicKey.cc Fri Jun 27 16:58:19 2008 @@ -21,8 +21,7 @@ #include "zypp/TmpPath.h" #include "zypp/PathInfo.h" #include "zypp/Date.h" - -//#include <ctime> +#include "zypp/TmpPath.h" using std::endl; @@ -94,6 +93,7 @@ if ( copy( keyfile, _data_file.path() ) != 0 ) ZYPP_THROW(Exception("Can't copy public key data from " + keyfile.asString() + " to " + _data_file.path().asString() )); + filesystem::TmpDir dir; const char* argv[] = { "gpg", @@ -102,6 +102,8 @@ "--fixed-list-mode", "--with-fingerprint", "--with-colons", + "--homedir", + dir.path().asString().c_str(), "--quiet", "--no-tty", "--no-greeting", -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> SuSE-SLE-10-SP3-Branch : Invoke gpg with --homdir
by Michael Andres 27 Jun '08

27 Jun '08

ref: refs/heads/SuSE-SLE-10-SP3-Branch commit 11f7b2d8bff75bb9edfbffb6673c8d0210f8e6b0 Author: Michael Andres <ma(a)suse.de> Date: Fri Jun 27 14:58:19 2008 +0000 Invoke gpg with --homdir --- VERSION | 2 +- package/libzypp.changes | 8 ++++++++ zypp/PublicKey.cc | 6 ++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index c4c7376..7858323 100644 --- a/VERSION +++ b/VERSION @@ -49,5 +49,5 @@ dnl ================================================== m4_define([LIBZYPP_MINOR], [32]) m4_define([LIBZYPP_COMPATMINOR], [15]) dnl ================================================== -m4_define([LIBZYPP_PATCH], [0]) +m4_define([LIBZYPP_PATCH], [1]) dnl ================================================== diff --git a/package/libzypp.changes b/package/libzypp.changes index 8edc7de..c679fa9 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jun 27 16:16:50 CEST 2008 - ma(a)suse.de + +- Invoke gpg with --homdir, otherwise command fails if executed + within a wrapper. (bnc #401259) +- version 2.32.1 +- revision 10484 + +------------------------------------------------------------------- Thu Jun 26 12:26:11 CEST 2008 - ma(a)suse.de - Import newer gpg keys if a trusted key is updated diff --git a/zypp/PublicKey.cc b/zypp/PublicKey.cc index d96eb12..2a87932 100644 --- a/zypp/PublicKey.cc +++ b/zypp/PublicKey.cc @@ -21,8 +21,7 @@ #include "zypp/TmpPath.h" #include "zypp/PathInfo.h" #include "zypp/Date.h" - -//#include <ctime> +#include "zypp/TmpPath.h" using std::endl; @@ -94,6 +93,7 @@ namespace zypp if ( copy( keyfile, _data_file.path() ) != 0 ) ZYPP_THROW(Exception("Can't copy public key data from " + keyfile.asString() + " to " + _data_file.path().asString() )); + filesystem::TmpDir dir; const char* argv[] = { "gpg", @@ -102,6 +102,8 @@ namespace zypp "--fixed-list-mode", "--with-fingerprint", "--with-colons", + "--homedir", + dir.path().asString().c_str(), "--quiet", "--no-tty", "--no-greeting", -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10483 - in /branches/SuSE-Linux-10_2-Branch/libzypp: VERSION package/libzypp.changes zypp/PublicKey.cc
by mlandres＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: mlandres Date: Fri Jun 27 16:50:16 2008 New Revision: 10483 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10483&view=rev Log: Invoke gpg with --homdir Modified: branches/SuSE-Linux-10_2-Branch/libzypp/VERSION branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.cc Modified: branches/SuSE-Linux-10_2-Branch/libzypp/VERSION URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/VERSION (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/VERSION Fri Jun 27 16:50:16 2008 @@ -61,5 +61,5 @@ m4_define([LIBZYPP_MINOR], [17]) m4_define([LIBZYPP_COMPATMINOR], [15]) dnl ================================================== -m4_define([LIBZYPP_PATCH], [0]) +m4_define([LIBZYPP_PATCH], [1]) dnl ================================================== Modified: branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes Fri Jun 27 16:50:16 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jun 27 16:16:50 CEST 2008 - ma(a)suse.de + +- Invoke gpg with --homdir, otherwise command fails if executed + within a wrapper. (bnc #401259) +- version 2.17.1 +- revision 10483 + +------------------------------------------------------------------- Fri Jun 27 11:29:09 CEST 2008 - ma(a)suse.de - Import newer gpg keys if a trusted key is updated Modified: branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.cc (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.cc Fri Jun 27 16:50:16 2008 @@ -21,8 +21,7 @@ #include "zypp/TmpPath.h" #include "zypp/PathInfo.h" #include "zypp/Date.h" - -//#include <ctime> +#include "zypp/TmpPath.h" using std::endl; @@ -95,6 +94,7 @@ if ( copy( keyfile, _data_file.path() ) != 0 ) ZYPP_THROW(Exception("Can't copy public key data from " + keyfile.asString() + " to " + _data_file.path().asString() )); + filesystem::TmpDir dir; const char* argv[] = { "gpg", @@ -103,6 +103,8 @@ "--fixed-list-mode", "--with-fingerprint", "--with-colons", + "--homedir", + dir.path().asString().c_str(), "--quiet", "--no-tty", "--no-greeting", -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10482 - in /branches/SuSE-Linux-10_3-Branch/libzypp: VERSION.cmake package/libzypp.changes zypp/PublicKey.cc
by mlandres＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: mlandres Date: Fri Jun 27 16:41:18 2008 New Revision: 10482 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10482&view=rev Log: Invoke gpg with --homdir Modified: branches/SuSE-Linux-10_3-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-10_3-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-10_3-Branch/libzypp/zypp/PublicKey.cc Modified: branches/SuSE-Linux-10_3-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-10_3-Branch/libzypp/VERSION.cmake Fri Jun 27 16:41:18 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "3") SET(LIBZYPP_MINOR "27") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") Modified: branches/SuSE-Linux-10_3-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-10_3-Branch/libzypp/package/libzypp.changes Fri Jun 27 16:41:18 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jun 27 16:16:50 CEST 2008 - ma(a)suse.de + +- Invoke gpg with --homdir, otherwise command fails if executed + within a wrapper. (bnc #401259) +- version 3.27.1 +- revision 10482 + +------------------------------------------------------------------- Thu Jun 26 15:31:24 CEST 2008 - ma(a)suse.de - Import newer gpg keys if a trusted key is updated Modified: branches/SuSE-Linux-10_3-Branch/libzypp/zypp/PublicKey.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_3-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/libzypp/zypp/PublicKey.cc (original) +++ branches/SuSE-Linux-10_3-Branch/libzypp/zypp/PublicKey.cc Fri Jun 27 16:41:18 2008 @@ -21,8 +21,7 @@ #include "zypp/TmpPath.h" #include "zypp/PathInfo.h" #include "zypp/Date.h" - -//#include <ctime> +#include "zypp/TmpPath.h" using std::endl; @@ -94,6 +93,7 @@ if ( copy( keyfile, _data_file.path() ) != 0 ) ZYPP_THROW(Exception("Can't copy public key data from " + keyfile.asString() + " to " + _data_file.path().asString() )); + filesystem::TmpDir dir; const char* argv[] = { "gpg", @@ -102,6 +102,8 @@ "--fixed-list-mode", "--with-fingerprint", "--with-colons", + "--homedir", + dir.path().asString().c_str(), "--quiet", "--no-tty", "--no-greeting", -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10481 - /branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc
by mlandres＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: mlandres Date: Fri Jun 27 16:27:57 2008 New Revision: 10481 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10481&view=rev Log: fix operator== Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc Fri Jun 27 16:27:57 2008 @@ -260,7 +260,9 @@ bool PublicKey::operator==( PublicKey b ) const { - return (b.id() == id()) && (b.fingerprint() == fingerprint() ); + return ( b.id() == id() + && b.fingerprint() == fingerprint() + && b.created() == created() ); } bool PublicKey::operator==( std::string sid ) const -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10480 - in /branches/SuSE-Linux-11_0-Branch/libzypp: VERSION.cmake package/libzypp.changes zypp/PublicKey.cc
by mlandres＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: mlandres Date: Fri Jun 27 16:19:28 2008 New Revision: 10480 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10480&view=rev Log: Invoke gpg with --homdir Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Fri Jun 27 16:19:28 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "26") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "5") +SET(LIBZYPP_PATCH "6") Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Fri Jun 27 16:19:28 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jun 27 16:16:50 CEST 2008 - ma(a)suse.de + +- Invoke gpg with --homdir, otherwise command fails if executed + within a wrapper. (bnc #401259) +- version 4.26.6 +- revision 10480 + +------------------------------------------------------------------- Fri Jun 20 15:31:57 CEST 2008 - ma(a)suse.de - Fix permanent duplication of gpg keys in the rpm database. Also Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc Fri Jun 27 16:19:28 2008 @@ -23,6 +23,7 @@ #include "zypp/base/Exception.h" #include "zypp/base/Logger.h" #include "zypp/Date.h" +#include "zypp/TmpPath.h" #include <ctime> @@ -57,7 +58,7 @@ std::string asString() const { - return "[" + id() + "] [" + name() + "] [" + fingerprint() + "]"; + return "[" + id() + "-" + str::hexstring(created(),8).substr(2) + "] [" + name() + "] [" + fingerprint() + "]"; } std::string armoredData() const @@ -97,6 +98,7 @@ if ( copy( keyfile, _data_file.path() ) != 0 ) ZYPP_THROW(Exception("Can't copy public key data from " + keyfile.asString() + " to " + _data_file.path().asString() )); + filesystem::TmpDir dir; const char* argv[] = { "gpg", @@ -105,6 +107,8 @@ "--fixed-list-mode", "--with-fingerprint", "--with-colons", + "--homedir", + dir.path().asString().c_str(), "--quiet", "--no-tty", "--no-greeting", -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0