diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-12-02 15:41:55 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2009-12-03 13:14:43 -0500 |
| commit | f11637c8d8ec9370a14284966be2f97de385b466 (patch) | |
| tree | 10ba1bb25bc2230c78f62f100947f13bde45cfe3 /booty | |
| parent | 9581135046aa223a9374b3d0fd19eba3d46051b3 (diff) | |
| download | anaconda-f11637c8d8ec9370a14284966be2f97de385b466.tar.gz anaconda-f11637c8d8ec9370a14284966be2f97de385b466.tar.xz anaconda-f11637c8d8ec9370a14284966be2f97de385b466.zip | |
Remove test mode.
This is yet another way of running anaconda that gets extremely limited use,
no testing, and no consideration during development to making sure it still
works. Again, we need to stop pretending and get rid of modes that we don't
support.
Diffstat (limited to 'booty')
| -rw-r--r-- | booty/ppc.py | 15 | ||||
| -rw-r--r-- | booty/sparc.py | 15 |
2 files changed, 14 insertions, 16 deletions
diff --git a/booty/ppc.py b/booty/ppc.py index e19e5d610..f8ace149e 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -141,14 +141,13 @@ class ppcBootloaderInfo(bootloaderInfo): ybinargs = [ yabootProg, "-f", "-C", cf ] - if not flags.test: - rc = iutil.execWithRedirect(ybinargs[0], - ybinargs[1:], - stdout = "/dev/tty5", - stderr = "/dev/tty5", - root = instRoot) - if rc: - return rc + rc = iutil.execWithRedirect(ybinargs[0], + ybinargs[1:], + stdout = "/dev/tty5", + stderr = "/dev/tty5", + root = instRoot) + if rc: + return rc if (not os.access(instRoot + "/etc/yaboot.conf", os.R_OK) and os.access(instRoot + "/boot/etc/yaboot.conf", os.R_OK)): diff --git a/booty/sparc.py b/booty/sparc.py index 22c4ab8b7..276eafd8f 100644 --- a/booty/sparc.py +++ b/booty/sparc.py @@ -93,14 +93,13 @@ class sparcBootloaderInfo(bootloaderInfo): else: sbinargs += ["-U"] - if not flags.test: - rc = iutil.execWithRedirect(sbinargs[0], - sbinargs[1:], - stdout = "/dev/tty5", - stderr = "/dev/tty5", - root = instRoot) - if rc: - return rc + rc = iutil.execWithRedirect(sbinargs[0], + sbinargs[1:], + stdout = "/dev/tty5", + stderr = "/dev/tty5", + root = instRoot) + if rc: + return rc if (not os.access(instRoot + "/etc/silo.conf", os.R_OK) and os.access(instRoot + "/boot/etc/silo.conf", os.R_OK)): |