[rhel7-branch 3/9] payload: fix driverdisk repos

[dashea]

From: Will Woods

addDriverRepos needs to happen before gatherRepoMetadata, otherwise we
don't gather its metadata.

Related: RHBZ#1084197
---
 pyanaconda/packaging/__init__.py   | 1 +
 pyanaconda/packaging/yumpayload.py | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py
index 6cc44d2..bf64709 100644
--- a/pyanaconda/packaging/__init__.py
+++ b/pyanaconda/packaging/__init__.py
@@ -1254,6 +1254,7 @@ def _runThread(self, storage, ksdata, payload, instClass, fallback, checkmount):
         # Download package metadata
         try:
             payload.updateBaseRepo(fallback=fallback, checkmount=checkmount)
+            payload.addDriverRepos()
         except (OSError, PayloadError) as e:
             log.error("PayloadError: %s", e)
             self._error = self.ERROR_SETUP
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 12b48f8..4c2a837 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -1405,8 +1405,6 @@ def preInstall(self, packages=None, groups=None):
         self.requiredPackages = packages
         self.requiredGroups = groups

-        self.addDriverRepos()
-
         if self.install_device:
             self._setupMedia(self.install_device)