Author: jkupec
Date: Wed Apr 30 15:05:22 2008
New Revision: 9908
URL: http://svn.opensuse.org/viewcvs/zypp?rev=9908&view=rev
Log:
- show label provided by libzypp (bnc #330094)
Modified:
trunk/zypper/src/zypper-media-callbacks.h
trunk/zypper/src/zypper.h
Modified: trunk/zypper/src/zypper-media-callbacks.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-media-callbacks.h?rev=9908&r1=9907&r2=9908&view=diff
==============================================================================
--- trunk/zypper/src/zypper-media-callbacks.h (original)
+++ trunk/zypper/src/zypper-media-callbacks.h Wed Apr 30 15:05:22 2008
@@ -80,7 +80,7 @@
// You can also have a look at the regular expressions used to check the answer here:
// /usr/lib/locale//LC_MESSAGES/SYS_LC_MESSAGES
_("Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation."))
- % gData.current_repo.name() % mediumNr);
+ % label % mediumNr);
if (read_bool_answer(PROMPT_YN_MEDIA_CHANGE, request, false))
return MediaChangeReport::RETRY;
else
Modified: trunk/zypper/src/zypper.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=9908&r1=9907&r2=9908&view=diff
==============================================================================
--- trunk/zypper/src/zypper.h (original)
+++ trunk/zypper/src/zypper.h Wed Apr 30 15:05:22 2008
@@ -92,6 +92,10 @@
std::listzypp::RepoInfo additional_repos;
int patches_count;
int security_patches_count;
+ /**
+ * Used by requestMedia callback
+ * \todo but now it uses label, remove this variable?
+ */
zypp::RepoInfo current_repo;
std::listzypp::SrcPackage::constPtr srcpkgs_to_install;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
