diff options
| author | Mike Fulbright <msf@redhat.com> | 2001-07-27 16:41:09 +0000 |
|---|---|---|
| committer | Mike Fulbright <msf@redhat.com> | 2001-07-27 16:41:09 +0000 |
| commit | 8aa076c6176efe7e7a8e7e8c45db499714f84735 (patch) | |
| tree | 55497b28338dde0493655cc0381f63efc0afb8a8 /videocard.py | |
| parent | 46e6a32f0de9c6c2c1505e9f161407bc1b8fea02 (diff) | |
| download | anaconda-8aa076c6176efe7e7a8e7e8c45db499714f84735.tar.gz anaconda-8aa076c6176efe7e7a8e7e8c45db499714f84735.tar.xz anaconda-8aa076c6176efe7e7a8e7e8c45db499714f84735.zip | |
dont fall over in reconfig if they are in text mode and didn't install Xconfigurator
Diffstat (limited to 'videocard.py')
| -rw-r--r-- | videocard.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/videocard.py b/videocard.py index a05f4cfac..988aea35b 100644 --- a/videocard.py +++ b/videocard.py @@ -20,6 +20,7 @@ import string import kudzu import iutil import isys +import os from log import log from translate import _ @@ -280,6 +281,9 @@ class VideoCardInfo: "P9000", "S3", "S3V", "SVGA", "W32", "VGA16" ]: Video_cardslist["Generic " + server] = { "SERVER" : server, "NAME" : "Generic " + server } + + if not os.access('/usr/X11R6/lib/X11/Cards', os.R_OK): + return -1 db = open ('/usr/X11R6/lib/X11/Cards') lines = db.readlines () @@ -322,7 +326,7 @@ class VideoCardInfo: else: card[info[0]] = string.joinfields (info[1:], ' ') - return + return 0 def cardsDB(self): return Video_cardslist @@ -348,7 +352,8 @@ class VideoCardInfo: self.videocards = [] self.primary = None - self.readCardsDB() + if self.readCardsDB() < 0: + return None for card in cards: (device, server, descr) = card |