[PATCH 1/2] Fix up calling superclass setup methods in packaging (#870556).
Chris Lumens
clumens at redhat.com
Mon Oct 29 18:09:50 UTC 2012
---
pyanaconda/packaging/__init__.py | 1 -
pyanaconda/packaging/livepayload.py | 2 ++
pyanaconda/packaging/tarpayload.py | 2 +-
pyanaconda/packaging/yumpayload.py | 2 ++
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py
index b7402c7..e415fbb 100644
--- a/pyanaconda/packaging/__init__.py
+++ b/pyanaconda/packaging/__init__.py
@@ -147,7 +147,6 @@ class Payload(object):
def setup(self, storage):
""" Do any payload-specific setup. """
self.storage = storage
- raise NotImplementedError()
def preStorage(self):
""" Do any payload-specific work necessary before writing the storage
diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py
index 78ff9e9..e47f46f 100644
--- a/pyanaconda/packaging/livepayload.py
+++ b/pyanaconda/packaging/livepayload.py
@@ -53,6 +53,8 @@ _ = lambda x: gettext.ldgettext("anaconda", x)
class LiveImagePayload(ImagePayload):
""" A LivePayload copies the source image onto the target system. """
def setup(self, storage):
+ super(LiveImagePayload, self).setup(storage)
+
# Mount the live device and copy from it instead of the overlay at /
osimg = storage.devicetree.getDeviceByPath(self.data.method.partition)
if not stat.S_ISBLK(os.stat(osimg.path)[stat.ST_MODE]):
diff --git a/pyanaconda/packaging/tarpayload.py b/pyanaconda/packaging/tarpayload.py
index 557bdbf..32361d8 100644
--- a/pyanaconda/packaging/tarpayload.py
+++ b/pyanaconda/packaging/tarpayload.py
@@ -58,7 +58,7 @@ class TarPayload(ArchivePayload):
self.archive = None
def setup(self, storage):
- super(TarPayload, self).setup()
+ super(TarPayload, self).setup(storage)
try:
self.archive = tarfile.open(self.image_file)
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 6a22bb6..25372cb 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -150,6 +150,8 @@ class YumPayload(PackagePayload):
self._resetYum(root=root)
def setup(self, storage):
+ super(YumPayload, self).setup(storage)
+
self._writeYumConfig()
self._setup = True
--
1.7.11.2
More information about the anaconda-patches
mailing list