Author: jreidinger
Date: Tue May 6 13:48:47 2008
New Revision: 9956
URL: http://svn.opensuse.org/viewcvs/zypp?rev=9956&view=rev
Log:
change isLocal to MediaAccess::downloads
decide only by first url
Modified:
trunk/zypper/src/zypper-repos.cc
Modified: trunk/zypper/src/zypper-repos.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=9956&r1=9955&r2=9956&view=diff
==============================================================================
--- trunk/zypper/src/zypper-repos.cc (original)
+++ trunk/zypper/src/zypper-repos.cc Tue May 6 13:48:47 2008
@@ -4,6 +4,7 @@
#include
#include
#include <iterator>
+#include <list>
#include "zypp/ZYpp.h"
#include "zypp/base/Logger.h"
@@ -15,6 +16,7 @@
#include "zypp/repo/RepoException.h"
#include "zypp/parser/ParseException.h"
#include "zypp/media/MediaException.h"
+#include "zypp/media/MediaAccess.h"
#include "zypper.h"
#include "output/Out.h"
@@ -1479,13 +1481,12 @@
{
for_(it, repos.begin(),repos.end())
{
- for_( it2,it->baseUrlsBegin(), it->baseUrlsEnd() )
+ if (!it->baseUrlsEmpty())
{
- if ( it2->isLocal() )
+ if ( !MediaAccess::downloads( *it->baseUrlsBegin()) )
{
string alias = it->alias();
toModify.insert( alias );
- break;
}
}
}
@@ -1495,13 +1496,12 @@
{
for_(it, repos.begin(),repos.end())
{
- for_( it2,it->baseUrlsBegin(), it->baseUrlsEnd() )
+ if (!it->baseUrlsEmpty())
{
- if ( !it2->isLocal() )
+ if ( MediaAccess::downloads( *it->baseUrlsBegin()) )
{
string alias = it->alias();
toModify.insert( alias );
- break;
}
}
}
@@ -1509,20 +1509,17 @@
if ( copts.count("medium-type") )
{
- string par = copts["medium-type"].front();
- std::set<string> scheme;
- insert_iterator ii (scheme,scheme.begin());
- str::split( par, ii, ",");
+ list<string> pars = copts["medium-type"];
+ set<string> scheme(pars.begin(),pars.end());
for_(it, repos.begin(),repos.end())
{
- for_( it2,it->baseUrlsBegin(), it->baseUrlsEnd() )
+ if (!it->baseUrlsEmpty())
{
- if ( scheme.find(it2->getScheme())!= scheme.end() )
+ if ( scheme.find(it->baseUrlsBegin()->getScheme())!= scheme.end() )
{
string alias = it->alias();
toModify.insert( alias );
- break;
}
}
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
