Mailinglist Archive: zypp-commit (606 mails)

[jkupec@xxxxxxxxxxxxxxxx]

Author: jkupec
Date: Sun Apr 13 02:20:29 2008
New Revision: 9576

URL: http://svn.opensuse.org/viewcvs/zypp?rev=9576&view=rev
Log:
- always check if repos are up-to-date on explicit user request
  (zypper ref)

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=9576&r1=9575&r2=9576&view=diff
==============================================================================
--- trunk/zypper/src/zypper-repos.cc (original)
+++ trunk/zypper/src/zypper-repos.cc Sun Apr 13 02:20:29 2008
@@ -72,7 +72,10 @@
         try
         {
           RepoManager::RefreshCheckStatus stat = manager.
-              checkIfToRefreshMetadata(repo, *it);
+              checkIfToRefreshMetadata(repo, *it,
+                zypper.command() == ZypperCommand::REFRESH ?
+                  RepoManager::RefreshIfNeededIgnoreDelay :
+                  RepoManager::RefreshIfNeeded);
           do_refresh = (stat == RepoManager::REFRESH_NEEDED);
           if (!do_refresh && zypper.command() == ZypperCommand::REFRESH)
           {
@@ -84,11 +87,11 @@
             break;
             case RepoManager::REPO_CHECK_DELAYED:
               zypper.out().info(boost::str(
-                format(_("Repository '%s': the status check has been 
delayed."))
-                    % repo.name()));
+                format(_("The up-to-date check of '%s' has been delayed."))
+                    % repo.name()), Out::HIGH);
             break;
             default:
-              WAR << "new item in enum, which is not cover" << endl;
+              WAR << "new item in enum, which is not covered" << endl;
             }
           }
           break; // don't check all the urls, just the first succussfull.
@@ -112,8 +115,12 @@
         boost::str(format(_("Downloading repository '%s' metadata.")) % 
repo.name());
       zypper.out().progressStart("raw-refresh", plabel, true);
 
-      manager.refreshMetadata(repo, force_download ?
-        RepoManager::RefreshForced : RepoManager::RefreshIfNeeded);
+      manager.refreshMetadata(repo,
+        force_download ?
+          RepoManager::RefreshForced :
+            zypper.command() == ZypperCommand::REFRESH ?
+              RepoManager::RefreshIfNeededIgnoreDelay :
+              RepoManager::RefreshIfNeeded);
 
       zypper.out().progressEnd("raw-refresh", plabel);
     }

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx