Author: mlandres Date: Thu Sep 25 13:17:17 2008 New Revision: 11160 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11160&view=rev Log: - Remove obsolete zypp-query-pool binary. zypper provides all the information one needs. Removed: trunk/libzypp/tools/registration/ Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/tools/CMakeLists.txt trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/Url.h Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=11160&r1=11159&r2=11160&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Sep 25 13:17:17 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Sep 25 13:11:43 CEST 2008 - ma@suse.de + +- Remove obsolete zypp-query-pool binary. zypper provides all + the information one needs. +- revision 11160 + +------------------------------------------------------------------- Wed Sep 24 19:11:19 CEST 2008 - jkupec@suse.cz - HistoryLog added and used to log package installs/removes and Modified: trunk/libzypp/tools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/CMakeLists.txt?rev=11160&r1=11159&r2=11160&view=diff ============================================================================== --- trunk/libzypp/tools/CMakeLists.txt (original) +++ trunk/libzypp/tools/CMakeLists.txt Thu Sep 25 13:17:17 2008 @@ -1,3 +1,2 @@ -ADD_SUBDIRECTORY( registration ) ADD_SUBDIRECTORY( package-manager ) #ADD_SUBDIRECTORY( migrate-sources ) Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=11160&r1=11159&r2=11160&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Thu Sep 25 13:17:17 2008 @@ -1226,8 +1226,11 @@ // check for credentials in Urls bool havePasswords = false; for_( urlit, tosave.baseUrlsBegin(), tosave.baseUrlsEnd() ) - if ( !urlit->getUsername().empty() && !urlit->getPassword().empty() ) - { havePasswords = true; break; } + if ( urlit->hasCredentialsInAuthority() ) + { + havePasswords = true; + break; + } // save the credentials if ( havePasswords ) { @@ -1235,11 +1238,11 @@ media::CredManagerOptions(_pimpl->options.rootDir) ); for_(urlit, tosave.baseUrlsBegin(), tosave.baseUrlsEnd()) - if (!urlit->getPassword().empty() && !urlit->getUsername().empty()) + if (urlit->hasCredentialsInAuthority()) //! \todo use a method calling UI callbacks to ask where to save creds? cm.saveInUser(media::AuthData(*urlit)); } - + HistoryLog().addRepository(tosave); progress.toMax(); @@ -1530,7 +1533,7 @@ _pimpl->services.insert( toSave ); // check for credentials in Url (username:password, not ?credentials param) - if ( !toSave.url().getUsername().empty() && !toSave.url().getPassword().empty() ) + if ( toSave.url().hasCredentialsInAuthority() ) { media::CredentialManager cm( media::CredManagerOptions(_pimpl->options.rootDir) ); @@ -1662,20 +1665,8 @@ url = service.url(); else { - // service repo can contain only one URL now, so no need to iterate + // service repo can contain only one URL now, so no need to iterate. url = *it->baseUrlsBegin(); - - url::ViewOption vopt; - vopt = vopt - - url::ViewOption::WITH_USERNAME - - url::ViewOption::WITH_PASSWORD - - url::ViewOption::WITH_QUERY_STR; - - // use the same username as the service in case the URL starts with - // the service url - if (url.asString(vopt).find(service.url().asString(vopt)) == 0 - && !service.url().getUsername().empty()) - url.setUsername(service.url().getUsername()); } // libzypp currently has problem with separate url + path handling Modified: trunk/libzypp/zypp/Url.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Url.h?rev=11160&r1=11159&r2=11160&view=diff ============================================================================== --- trunk/libzypp/zypp/Url.h (original) +++ trunk/libzypp/zypp/Url.h Thu Sep 25 13:17:17 2008 @@ -342,10 +342,10 @@ getPassword(EEncoding eflag = zypp::url::E_DECODED) const; /** - * Returns \c true if username or password are encoded in the authority component. + * Returns \c true if username \b and password are encoded in the authority component. */ bool hasCredentialsInAuthority() const - { return ! ( getUsername().empty() && getPassword().empty() ); } + { return ! ( getUsername().empty() || getPassword().empty() ); } /** * Returns the hostname or IP from the URL authority. -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org