summaryrefslogtreecommitdiffstats
path: root/iw
diff options
context:
space:
mode:
authorMike Fulbright <msf@redhat.com>1999-11-16 23:45:35 +0000
committerMike Fulbright <msf@redhat.com>1999-11-16 23:45:35 +0000
commit94c746ecd825a8b8024da0f553cd36be8d9153c8 (patch)
treecc9797269aca9c8546c7f4b6bc4fead0703c952b /iw
parent069f05c6b650f84ccb4a676776e760a68493b47b (diff)
downloadanaconda-94c746ecd825a8b8024da0f553cd36be8d9153c8.tar.gz
anaconda-94c746ecd825a8b8024da0f553cd36be8d9153c8.tar.xz
anaconda-94c746ecd825a8b8024da0f553cd36be8d9153c8.zip
Added code for when in unconfig mode to see if we actually should
configure X (tests to see if XFree86 package is installed). Dr Mike
Diffstat (limited to 'iw')
-rw-r--r--iw/xconfig.py16
1 files changed, 14 insertions, 2 deletions
diff --git a/iw/xconfig.py b/iw/xconfig.py
index 1d6020239..d14e8da37 100644
--- a/iw/xconfig.py
+++ b/iw/xconfig.py
@@ -167,8 +167,20 @@ class XConfigWindow (InstallWindow):
self.didTest = 1
def getScreen (self):
- if not self.todo.hdList.packages.has_key('XFree86') or \
- not self.todo.hdList.packages['XFree86'].selected: return None
+ #
+ # if in unconfigOnly mode we query existing rpm db
+ # if X not installed, just skip this step
+ #
+ if self.todo.unconfigOnly:
+ import rpm
+ db = rpm.opendb()
+ rc = db.findbyname ("XFree86")
+ if len(rc) == 0:
+ return None
+
+ else:
+ if not self.todo.hdList.packages.has_key('XFree86') or \
+ not self.todo.hdList.packages['XFree86'].selected: return None
self.todo.x.probe ()