Mailinglist Archive: zypp-commit (275 mails)

[Michael Andres <ma@xxxxxxx>]

ref: refs/heads/master
commit 7f78e0d4f6d937d4ff23361da6d8f162e08ce7c4
Author: Michael Andres <ma@xxxxxxx>
Date:   Fri Oct 23 13:37:19 2009 +0200

    fix usage of deprecated methods
---
 src/repos.cc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/repos.cc b/src/repos.cc
index 8ee2264..0cdf3f8 100644
--- a/src/repos.cc
+++ b/src/repos.cc
@@ -492,7 +492,7 @@ static void do_init_repos(Zypper & zypper, const Container 
& container)
           it->name().c_str(), "no-cd"));
       gData.repos.erase(it++);
     }
-    if (no_remote && MediaAccess::downloads(*it->baseUrlsBegin()))
+    if (no_remote && (*it->baseUrlsBegin()).schemeIsDownloading())
     {
       zypper.out().info(str::form(
           _("Ignoring repository '%s' because of '%s' option."),
@@ -1652,7 +1652,7 @@ void modify_repos_by_option( Zypper & zypper )
     {
       if (!it->baseUrlsEmpty())
       {
-        if ( !MediaAccess::downloads( *it->baseUrlsBegin()) )
+        if ( ! (*it->baseUrlsBegin()).schemeIsDownloading() )
         {
           string alias = it->alias();
           toModify.insert( alias );
@@ -1667,7 +1667,7 @@ void modify_repos_by_option( Zypper & zypper )
     {
       if (!it->baseUrlsEmpty())
       {
-        if ( MediaAccess::downloads( *it->baseUrlsBegin()) )
+        if ( (*it->baseUrlsBegin()).schemeIsDownloading() )
         {
           string alias = it->alias();
           toModify.insert( alias );
@@ -2787,10 +2787,10 @@ void modify_services_by_option( Zypper & zypper )
     if (url.isValid())
     {
       bool modify = false;
-      if (local  && !MediaAccess::downloads( url ) )
+      if (local  && ! url.schemeIsDownloading() )
         modify = true;
 
-      if (!modify && remote && MediaAccess::downloads( url ) )
+      if (!modify && remote && url.schemeIsDownloading() )
         modify = true;
 
       if (!modify && schemes.find(url.getScheme()) != schemes.end())
-- 
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx