-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Thu, 6 May 2010, Chris Lumens wrote:
diff --git a/storage/dasd.py b/storage/dasd.py
index 6c9241f..96508b7 100644
--- a/storage/dasd.py
+++ b/storage/dasd.py
@@ -108,7 +108,7 @@ class DASD:
if intf and askUser:
devs = ''
for dasd, bypath in self._dasdlist:
- devs += "/dev/disk/by-path/%s\n" % (bypath,)
+ devs += "%s\n" % (bypath,)
rc = intf.questionInitializeDASD(c, devs)
if rc == 1:
@@ -147,7 +147,7 @@ class DASD:
pw = intf.progressWindow(title, msg, 100, pulse=True)
for dasd, bypath in self._dasdlist:
- log.info("Running dasdfmt on /dev/disk/by-path/%s" % (bypath,))
+ log.info("Running dasdfmt on %s" % (bypath,))
arglist = argv + ["/dev/" + dasd]
try:
In #6 and #7, you assumed the caller was going to deal with the case
where a device's by-path is None. Should you perhaps be throwing those
out of self._dasdlist before getting to this point?
Yeah, another patch.
diff --git a/storage/dasd.py b/storage/dasd.py
index 96508b7..83c3cde 100644
- --- a/storage/dasd.py
+++ b/storage/dasd.py
@@ -85,6 +85,9 @@ class DASD:
if status in ["unformatted"] and device not in exclusiveDisks:
bypath = deviceNameToDiskByPath(device)
+ if not bypath:
+ bypath = "/dev/" + device
+
log.info(" %s (%s) status is %s, needs dasdfmt" % (device,
bypath,
status,))
- --
David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAkvjNVwACgkQ5hsjjIy1VknkhACgiJfvKv1yfZ7W5tB5g7uA5bTR
75wAoKjGpbSX+zE8Li8MWMHd/cR+KbXc
=IGGO
-----END PGP SIGNATURE-----
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
