updateBaseRepo does not need a storage argument.

It can get it as an attribute off the Payload object, now that setup is
always being called.

2 files changed, 5 insertions, 6 deletions

diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py
index e415fbb90..25d4aa2b8 100644
--- a/pyanaconda/packaging/__init__.py
+++ b/pyanaconda/packaging/__init__.py
@@ -220,7 +220,7 @@ class Payload(object):
         self.data.method.proxy = ""
         self.data.method.opts = None
 
-    def updateBaseRepo(self, storage):
+    def updateBaseRepo(self):
         """ Update the base repository from ksdata.method. """
         pass
 
@@ -744,7 +744,7 @@ if __name__ == "__main__":
     ksdata.method.url = "http://dl.fedoraproject.org/pub/fedora/linux/development/17/x86_64/os/"
 
     # now switch the base repo to what we set ksdata.method to just above
-    payload.updateBaseRepo(storage)
+    payload.updateBaseRepo()
     for repo in payload._yum.repos.repos.values():
         print repo.name, repo.enabled
 
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 25372cb7b..6b423fc04 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -155,7 +155,7 @@ class YumPayload(PackagePayload):
         self._writeYumConfig()
         self._setup = True
 
-        self.updateBaseRepo(storage)
+        self.updateBaseRepo()
 
         # When setup is called, it's already in a separate thread. That thread
         # will try to select groups right after this returns, so make sure we
@@ -375,8 +375,7 @@ reposdir=%s
 
         return base_repo_name
 
-    def updateBaseRepo(self, storage, fallback=True, root=None,
-                       checkmount=True):
+    def updateBaseRepo(self, fallback=True, root=None, checkmount=True):
         """ Update the base repo based on self.data.method.
 
             - Tear down any previous base repo devices, symlinks, &c.
@@ -395,7 +394,7 @@ reposdir=%s
 
         # see if we can get a usable base repo from self.data.method
         try:
-            self._configureBaseRepo(storage, checkmount=checkmount)
+            self._configureBaseRepo(self.storage, checkmount=checkmount)
         except PayloadError as e:
             if not fallback:
                 for repo in self._yum.repos.repos.values():