Ack. Make sure this ends up on master and rhel6-branch.
On Thu, 12 Aug 2010, Martin Sivak wrote:
---
constants.py | 3 ++-
yuminstall.py | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/constants.py b/constants.py
index e6fbd3b..b1baa4e 100644
--- a/constants.py
+++ b/constants.py
@@ -19,6 +19,7 @@
# Author(s): Erik Troan <ewt@xxxxxxxxxx>
#
+import re
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
N_ = lambda x: x
@@ -84,7 +85,7 @@ else:
exceptionText += _(" against anaconda at %s") %(bugzillaUrl,)
# DriverDisc Paths
-DD_EXTRACTED = "/tmp/DD"
+DD_EXTRACTED = re.compile("/lib/modules/[^/]+/updates/DD/(?P<modulename>.+)")
DD_RPMS = "/tmp/DD-*"
TRANSLATIONS_UPDATE_DIR="/tmp/updates/po"
diff --git a/yuminstall.py b/yuminstall.py
index ce1f898..938cbd9 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -1398,8 +1398,9 @@ debuglevel=10
#We need to install the packages which contain modules from DriverDiscs
for modPath in isys.modulesWithPaths():
- if modPath.startswith(DD_EXTRACTED):
- moduleProvides.append(modPath[len(DD_EXTRACTED):])
+ match = DD_EXTRACTED.match(modPath):
+ if match:
+ moduleProvides.append(match.group("modulename"))
else:
continue
--
David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
