--- backend.py | 6 +++--- constants.py | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/backend.py b/backend.py index 32533cb..6cb725f 100644 --- a/backend.py +++ b/backend.py @@ -74,7 +74,7 @@ class AnacondaBackend: def copyFirmware(self, anaconda): # Multiple driver disks may be loaded, so we need to glob for all # the firmware files in the common DD firmware directory - for f in glob.glob(DD_EXTRACTED+"/lib/firmware/*"): + for f in glob.glob(DD_FIRMWARE+"/*"): try: shutil.copyfile(f, "%s/lib/firmware/" % anaconda.rootPath) except IOError, e: @@ -106,9 +106,9 @@ class AnacondaBackend: shutil.copytree(d, anaconda.rootPath + "/root/" + os.path.basename(d)) #copy modules and firmware - if os.path.exists(DD_EXTRACTED): + if os.path.exists(DD_ALL): try: - shutil.copytree(DD_EXTRACTED, anaconda.rootPath + "/root/DD") + shutil.copytree(DD_ALL, anaconda.rootPath + "/root/DD") except IOError, e: pass diff --git a/constants.py b/constants.py index b1baa4e..1ed9b55 100644 --- a/constants.py +++ b/constants.py @@ -85,7 +85,9 @@ else: exceptionText += _(" against anaconda at %s") %(bugzillaUrl,) # DriverDisc Paths +DD_ALL = "/tmp/DD" DD_EXTRACTED = re.compile("/lib/modules/[^/]+/updates/DD/(?P<modulename>.+)") +DD_FIRMWARE = "/tmp/DD/lib/firmware" DD_RPMS = "/tmp/DD-*" TRANSLATIONS_UPDATE_DIR="/tmp/updates/po" -- 1.6.6.1 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list