Attachment 666242 Details for Bug 888887 – Ugly hack

[patch] Ugly hack

0001-Set-yumarch-to-ppc64-for-the-BuildInstall-stage.patch (text/plain), 1.74 KB, created by David Aquilina on 2012-12-19 17:39:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Aquilina

Created: 2012-12-19 17:39:29 UTC

Size: 1.74 KB

patch

obsolete

>diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
>index a2ac2fc..3d77101 100644
>--- a/src/pypungi/__init__.py
>+++ b/src/pypungi/__init__.py
>@@ -28,6 +28,8 @@ import pylorax
> from fnmatch import fnmatch
> 
> 
>+buildinstallstage = None
>+
> class MyConfigParser(ConfigParser.ConfigParser):
>     """A subclass of ConfigParser which does not lowercase options"""
> 
>@@ -204,6 +206,7 @@ class Pungi(pypungi.PungiBase):
>             os.remove(os.path.join(thisrepo.cachedir, 'repomd.xml'))
> 
>     def _inityum(self):
>+        global buildinstallstage
>         """Initialize the yum object.  Only needed for certain actions."""
> 
>         # Create a yum object to use
>@@ -233,7 +236,10 @@ class Pungi(pypungi.PungiBase):
>         if arch == 'i386':
>             yumarch = 'athlon'
>-        elif arch == 'ppc':
>-            yumarch = 'ppc64p7'
>+        elif arch in ['ppc', 'ppc64']:
>+            if buildinstallstage:
>+                yumarch = 'ppc64'
>+            else:
>+                yumarch = 'ppc64p7'
>         elif arch == 'sparc':
>             yumarch = 'sparc64v'
>         elif arch == 'arm':
>@@ -295,7 +301,7 @@ class Pungi(pypungi.PungiBase):
> 
>         if po.arch == 'src' or 'debuginfo' in po.name:
>             return False
>-
>+	
>         return True
> 
>     def verifyCachePkg(self, po, path): # Stolen from yum
>@@ -883,8 +889,12 @@ class Pungi(pypungi.PungiBase):
>             self._makeMetadata(path, cachedir, repoview=False)
> 
>     def doBuildinstall(self):
>+        global buildinstallstage
>         """Run lorax on the tree."""
> 
>+        # power needs the arch changed depending on what stage we're in
>+        buildinstallstage = True
>+
>         # the old ayum object has transaction data that confuse lorax, reinit.
>         self._inityum()
> 
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 888887: 666242