|
Bill Nottingham |
214eb64 |
commit cc7f44b6a0183ca07e437bb03020dfef64520c74
|
|
Bill Nottingham |
214eb64 |
Author: Bill Nottingham <notting@redhat.com>
|
|
Bill Nottingham |
214eb64 |
Date: Thu Dec 2 15:00:43 2010 -0500
|
|
Bill Nottingham |
214eb64 |
|
|
Bill Nottingham |
214eb64 |
Add a 'prefer_ppc64' arch option (<jwboyer@gmail.com>)
|
|
Bill Nottingham |
214eb64 |
|
|
Bill Nottingham |
214eb64 |
diff --git a/mash/__init__.py b/mash/__init__.py
|
|
Bill Nottingham |
214eb64 |
index 8f5ff97..b1be033 100644
|
|
Bill Nottingham |
214eb64 |
--- a/mash/__init__.py
|
|
Bill Nottingham |
214eb64 |
+++ b/mash/__init__.py
|
|
Bill Nottingham |
214eb64 |
@@ -82,6 +82,9 @@ class Mash:
|
|
Bill Nottingham |
214eb64 |
self.config = config
|
|
Bill Nottingham |
214eb64 |
self.session = koji.ClientSession(config.buildhost, {})
|
|
Bill Nottingham |
214eb64 |
self._setupLogger()
|
|
Bill Nottingham |
214eb64 |
+ if self.config.prefer_ppc64:
|
|
Bill Nottingham |
214eb64 |
+ del masharch.biarch['ppc']
|
|
Bill Nottingham |
214eb64 |
+ masharch.biarch.setdefault('ppc64','ppc')
|
|
Bill Nottingham |
214eb64 |
|
|
Bill Nottingham |
214eb64 |
def _setupLogger(self):
|
|
Bill Nottingham |
214eb64 |
self.logger = logging.getLogger('mash')
|
|
Bill Nottingham |
214eb64 |
diff --git a/mash/config.py b/mash/config.py
|
|
Bill Nottingham |
214eb64 |
index 6508143..9b2351d 100644
|
|
Bill Nottingham |
214eb64 |
--- a/mash/config.py
|
|
Bill Nottingham |
214eb64 |
+++ b/mash/config.py
|
|
Bill Nottingham |
214eb64 |
@@ -49,6 +49,7 @@ class MashConfig(config.BaseConfig):
|
|
Bill Nottingham |
214eb64 |
latest = config.BoolOption(True)
|
|
Bill Nottingham |
214eb64 |
distro_tags = config.Option()
|
|
Bill Nottingham |
214eb64 |
content_tags = config.ListOption()
|
|
Bill Nottingham |
214eb64 |
+ prefer_ppc64 = config.BoolOption(False)
|
|
Bill Nottingham |
214eb64 |
distros = []
|
|
Bill Nottingham |
214eb64 |
|
|
Bill Nottingham |
214eb64 |
class MashDistroConfig(config.BaseConfig):
|
|
Bill Nottingham |
214eb64 |
@@ -83,6 +84,7 @@ class MashDistroConfig(config.BaseConfig):
|
|
Bill Nottingham |
214eb64 |
latest = config.Inherit(MashConfig.latest)
|
|
Bill Nottingham |
214eb64 |
distro_tags = config.Inherit(MashConfig.distro_tags)
|
|
Bill Nottingham |
214eb64 |
content_tags = config.Inherit(MashConfig.content_tags)
|
|
Bill Nottingham |
214eb64 |
+ prefer_ppc64 = config.Inherit(MashConfig.prefer_ppc64)
|
|
Bill Nottingham |
214eb64 |
hash_packages = config.BoolOption(False)
|
|
Bill Nottingham |
214eb64 |
parent_repos = config.ListOption()
|
|
Bill Nottingham |
214eb64 |
previous = None
|