[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH] Do not show "missing media" message when unknown media is needed for package.



If driverdisc package was detected in transaction, anaconda added -99 to the list of required media. This then caused a missing media dialog to be shown.
Resolves: rhbz#617262
---
 image.py |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/image.py b/image.py
index 4376f84..447ef28 100644
--- a/image.py
+++ b/image.py
@@ -47,6 +47,12 @@ else:
 def presentRequiredMediaMessage(anaconda):
     reqcds = anaconda.backend.ayum.tsInfo.reqmedia.keys()
 
+    # -99 means unknown media, ignore it if present
+    try:
+        reqcds.remove(-99)
+    except ValueError:
+        pass # ignore, we are happy to know nothing about -99 here
+
     # if only one CD required no need to pop up a message
     if len(reqcds) < 2:
 	return
@@ -77,8 +83,6 @@ def presentRequiredMediaMessage(anaconda):
     reqcds.sort()
     reqcdstr = ""
     for cdnum in reqcds:
-        if cdnum == -99: # non-CD bits
-            continue
 	reqcdstr += "\t\t%s %s disc #%d\n" % (product.productName, product.productVersion, cdnum,)
 		
     return anaconda.intf.messageWindow( _("Required Install Media"),
-- 
1.7.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]