From 06542ac662a89a49b95808d84ebf257a68609517 Mon Sep 17 00:00:00 2001 From: Jan Kupec Date: Wed, 30 Apr 2008 13:05:22 +0000 Subject: [PATCH] - show label provided by libzypp (bnc #330094) --- src/zypper-media-callbacks.h | 2 +- src/zypper.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/zypper-media-callbacks.h b/src/zypper-media-callbacks.h index 4bcc84e..c4405bd 100644 --- a/src/zypper-media-callbacks.h +++ b/src/zypper-media-callbacks.h @@ -80,7 +80,7 @@ namespace ZmartRecipients // 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 diff --git a/src/zypper.h b/src/zypper.h index f92df6e..abd0393 100644 --- a/src/zypper.h +++ b/src/zypper.h @@ -92,6 +92,10 @@ struct RuntimeData std::list 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::list srcpkgs_to_install; -- 2.7.4