From 4209733024a7273235f50695e31cf09626a8a459 Mon Sep 17 00:00:00 2001 From: Jan Kupec Date: Wed, 29 Aug 2007 16:28:36 +0000 Subject: [PATCH] - reverted blocking of requestMedia from r6271 (#301710) --- zypp/MediaSetAccess.cc | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/zypp/MediaSetAccess.cc b/zypp/MediaSetAccess.cc index ad68195..2cf0ee2 100644 --- a/zypp/MediaSetAccess.cc +++ b/zypp/MediaSetAccess.cc @@ -245,18 +245,13 @@ IMPL_PTR_TYPE(MediaSetAccess); reason = media::MediaChangeReport::WRONG; } - // request media change, if the media is changeable and this is - // not just a check, otherwise just abort - if (checkonly || !media_mgr.isChangeable(media)) - user = media::MediaChangeReport::ABORT; - else - user = - report->requestMedia ( - Repository::noRepository, - media_nr, - reason, - excp.asUserString() - ); + user = checkonly ? media::MediaChangeReport::ABORT : + report->requestMedia ( + Repository::noRepository, + media_nr, + reason, + excp.asUserString() + ); DBG << "ProvideFile exception caught, callback answer: " << user << endl; @@ -386,18 +381,10 @@ IMPL_PTR_TYPE(MediaSetAccess); reason = media::MediaChangeReport::WRONG; } - - // request media change, if the media is changeable, otherwise just abort - if (media_mgr.isChangeable(_media)) - user = - report->requestMedia( - Repository::noRepository, - media_nr, - reason, - excp.asUserString() - ); - else - user = media::MediaChangeReport::ABORT; + user = report->requestMedia(Repository::noRepository, + media_nr, + reason, + excp.asUserString()); DBG << "ProvideFile exception caught, callback answer: " << user << endl; -- 2.7.4