From: Jan Kupec <jkupec@suse.cz>
Date: Thu, 4 Sep 2008 16:40:55 +0000 (+0000)
Subject: - tell RepoManager the target distribution before refreshing services
X-Git-Tag: BASE-SuSE-Code-11-Branch~177
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=afe584d460143547d8d9c5ef009333f007a0dfb9;p=platform%2Fupstream%2Fzypper.git

- tell RepoManager the target distribution before refreshing services
---

diff --git a/src/Zypper.cc b/src/Zypper.cc
index e55bf15..ee14494 100644
--- a/src/Zypper.cc
+++ b/src/Zypper.cc
@@ -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);
diff --git a/src/main.cc b/src/main.cc
index 118e8de..e91c418 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -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);
     }