Author: mlandres Date: Thu Sep 18 16:14:27 2008 New Revision: 11097 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11097&view=rev Log: Use service alias as namespace for its repositories aliases. Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/ServiceInfo.cc Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=11097&r1=11096&r2=11097&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Sep 18 16:14:27 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 18 16:11:23 CEST 2008 - ma@suse.de + +- Use service alias as namespace for it's repositories aliases. +- revision 11097 + +------------------------------------------------------------------- Thu Sep 18 12:45:25 CEST 2008 - jkupec@suse.cz - pass service's credentials down to repos Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=11097&r1=11096&r2=11097&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Thu Sep 18 16:14:27 2008 @@ -121,7 +121,7 @@ { DBG << "Target not initialized, using an empty servicesTargetDistro." << endl; } - + rootDir = root_r; } @@ -1238,7 +1238,7 @@ for_(urlit, tosave.baseUrlsBegin(), tosave.baseUrlsEnd()) if (!urlit->getPassword().empty() && !urlit->getUsername().empty()) //! \todo use a method calling UI callbacks to ask where to save creds? - cm.saveInUser(media::AuthData(*urlit)); + cm.saveInUser(media::AuthData(*urlit)); } progress.toMax(); @@ -1672,6 +1672,9 @@ it->setPath(""); } + // Prepend service alias: + it->setAlias( str::form( "%s: %s", service.alias().c_str(), it->alias().c_str() ) ); + // use the same credentials as the service if (!serviceCredParam.empty()) url.setQueryParam("credentials", serviceCredParam); @@ -1732,7 +1735,7 @@ // exists outside this service. Maybe forcefully re-alias // the existing repo? addRepository( *it ); - + // save repo credentials } else @@ -1746,7 +1749,7 @@ oldRepoModified = true; } -#warning also check changed URL due to PATH/URL change in service, but ignore ?credentials param! +#warning also check changed URL due to PATH/URL change in service, but ignore ?credentials param! // save if modified: if ( oldRepoModified ) { Modified: trunk/libzypp/zypp/ServiceInfo.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ServiceInfo.cc?rev=11097&r1=11096&r2=11097&view=diff ============================================================================== --- trunk/libzypp/zypp/ServiceInfo.cc (original) +++ trunk/libzypp/zypp/ServiceInfo.cc Thu Sep 18 16:14:27 2008 @@ -16,7 +16,6 @@ #include "zypp/parser/xml/XmlEscape.h" #include "zypp/RepoInfo.h" -#include "zypp/parser/RepoindexFileReader.h" #include "zypp/repo/RepoInfoBaseImpl.h" #include "zypp/ServiceInfo.h" -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org