[PATCH 3/4] Replace calls to isys.getDasdPorts() with calls to new getDasdPorts()

[David Cantrell <dcantrell@xxxxxxxxxx>]

---
 iw/zipl_gui.py     |    8 ++++----
 textw/zipl_text.py |    9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/iw/zipl_gui.py b/iw/zipl_gui.py
index a4c36aa..9f2bdc2 100644
--- a/iw/zipl_gui.py
+++ b/iw/zipl_gui.py
@@ -19,11 +19,11 @@
 #
 
 # must replace with explcit form so update disks will work
-import isys
 import gtk
 import string
 from iw_gui import *
 from constants import *
+from storage.dasd import getDasdPorts
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
 
@@ -101,11 +101,11 @@ class ZiplWindow (InstallWindow):
             kernelparms = self.bl.args.get()
         else:
             kernelparms = ""
-        if isys.getDasdPorts() and (kernelparms.find("dasd=") == -1):
+        if getDasdPorts() and (kernelparms.find("dasd=") == -1):
             if len(kernelparms) > 0:
-                kernelparms = "%s dasd=%s" %(kernelparms, isys.getDasdPorts())
+                kernelparms = "%s dasd=%s" %(kernelparms, getDasdPorts())
             else:
-                kernelparms = "dasd=%s" %(isys.getDasdPorts(),)
+                kernelparms = "dasd=%s" %(getDasdPorts(),)
         self.kernelEntry.set_text(kernelparms)
         
         if self.bl.args and self.bl.args.chandevget():
diff --git a/textw/zipl_text.py b/textw/zipl_text.py
index 23789ff..9a1b202 100644
--- a/textw/zipl_text.py
+++ b/textw/zipl_text.py
@@ -18,12 +18,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import isys
 import string
 from snack import *
 from constants_text import *
 
 from constants import *
+from storage.dasd import getDasdPorts
+
 import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
 
@@ -45,11 +46,11 @@ class ZiplWindow:
 
         if self.bl.args and self.bl.args.get():
             kernelparms = self.bl.args.get()
-        if isys.getDasdPorts() and (kernelparms.find("dasd=") == -1):
+        if getDasdPorts() and (kernelparms.find("dasd=") == -1):
             if len(kernelparms) > 0:
-                kernelparms = "%s dasd=%s" %(kernelparms, isys.getDasdPorts())
+                kernelparms = "%s dasd=%s" %(kernelparms, getDasdPorts())
             else:
-                kernelparms = "dasd=%s" %(isys.getDasdPorts(),)
+                kernelparms = "dasd=%s" %(getDasdPorts(),)
         kernelentry.set(kernelparms)
 
         if self.bl.args and self.bl.args.chandevget():
-- 
1.6.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list