- tell RepoManager the target distribution before refreshing services
authorJan Kupec <jkupec@suse.cz>
Thu, 4 Sep 2008 16:40:55 +0000 (16:40 +0000)
committerJan Kupec <jkupec@suse.cz>
Thu, 4 Sep 2008 16:40:55 +0000 (16:40 +0000)
src/Zypper.cc
src/main.cc

index e55bf15..ee14494 100644 (file)
@@ -2083,6 +2083,8 @@ void Zypper::doCommand()
 
     // needed to be able to retrieve target distribution
     init_target(*this);
+    this->_gopts.rm_options.servicesTargetDistro =
+      God->target()->targetDistribution();
 
     refresh_services(*this);
 
@@ -2526,6 +2528,10 @@ void Zypper::doCommand()
         setExitCode(ZYPPER_EXIT_ERR_PRIVILEGES);
         return;
       }
+      // needed to be able to retrieve target distribution
+      init_target(*this);
+      this->_gopts.rm_options.servicesTargetDistro =
+            God->target()->targetDistribution();
       refresh_services(*this);
     }
     refresh_repos(*this);
index 118e8de..e91c418 100644 (file)
@@ -41,7 +41,7 @@ void signal_handler(int sig)
     else*/
     {
       // translators: this will show up if you press ctrl+c twice outside of zypper shell
-      cerr << _("OK OK! Exiting immediately...") << endl;
+      cerr << endl << _("OK OK! Exiting immediately...") << endl;
       zypper.cleanup();
       exit(ZYPPER_EXIT_ON_SIGNAL);
     }