[ostree] ostbuild: Drop down to Python 2.6
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] ostbuild: Drop down to Python 2.6
- Date: Tue, 21 Feb 2012 03:33:29 +0000 (UTC)
commit 341096f18a5712ddd88a02a6f266b8ae2df3a7fd
Author: Colin Walters <walters verbum org>
Date: Mon Feb 20 22:31:10 2012 -0500
ostbuild: Drop down to Python 2.6
Hopefully this gets us working on RHEL6.
.../pyostbuild/builtin_autodiscover_meta.py | 16 ++++++++--------
.../pyostbuild/builtin_chroot_compile_one.py | 8 ++++----
src/ostbuild/pyostbuild/builtin_compile_one.py | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/ostbuild/pyostbuild/builtin_autodiscover_meta.py b/src/ostbuild/pyostbuild/builtin_autodiscover_meta.py
index 9e7c6ff..235927b 100755
--- a/src/ostbuild/pyostbuild/builtin_autodiscover_meta.py
+++ b/src/ostbuild/pyostbuild/builtin_autodiscover_meta.py
@@ -24,6 +24,7 @@ import json
from . import builtins
from . import buildutil
from .ostbuildlog import log, fatal
+from .subprocess_helpers import run_sync, run_sync_get_output
class OstbuildAutodiscoverMeta(builtins.Builtin):
name = "autodiscover-meta"
@@ -76,14 +77,13 @@ class OstbuildAutodiscoverMeta(builtins.Builtin):
def _discover_branch_from_git(self):
if os.path.isdir('.git'):
- try:
- try:
- ref = subprocess.check_output(['git', 'symbolic-ref', 'HEAD'], stderr=open('/dev/null', 'w'))
- return ref.replace('refs/heads/', '').strip()
- except subprocess.CalledProcessError, e:
- return subprocess.check_output(['git', 'describe', '--tags', '--exact-match', 'HEAD']).strip()
- except subprocess.CalledProcessError, e:
- return None
+ devnull=open('/dev/null', 'w')
+ ref = run_sync_get_output(['git', 'symbolic-ref', 'HEAD'], stderr=devnull, none_on_error=True)
+ if ref is not None:
+ return ref.replace('refs/heads/', '').strip()
+ ref = run_sync_get_output(['git', 'describe', '--tags', '--exact-match', 'HEAD'], stderr=devnull, none_on_error=True)
+ if ref is not None:
+ return ref
return None
builtins.register(OstbuildAutodiscoverMeta)
diff --git a/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py b/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
index 43bbb53..cfc1836 100755
--- a/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
+++ b/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
@@ -23,7 +23,7 @@ import json
from . import builtins
from . import buildutil
from .ostbuildlog import log, fatal
-from .subprocess_helpers import run_sync
+from .subprocess_helpers import run_sync, run_sync_get_output
class OstbuildChrootCompileOne(builtins.Builtin):
name = "chroot-compile-one"
@@ -41,7 +41,7 @@ class OstbuildChrootCompileOne(builtins.Builtin):
(args, rest_args) = parser.parse_known_args(argv)
if args.meta is None:
- output = subprocess.check_output(['ostbuild', 'autodiscover-meta'])
+ output = run_sync_get_output(['ostbuild', 'autodiscover-meta'])
self.metadata = json.loads(output)
else:
f = open(args.meta)
@@ -67,8 +67,8 @@ class OstbuildChrootCompileOne(builtins.Builtin):
shutil.rmtree(child_tmpdir)
os.mkdir(child_tmpdir)
- rev = subprocess.check_output(['ostree', '--repo=' + args.repo, 'rev-parse', args.buildroot])
- rev=rev.strip()
+ rev = run_sync_get_output(['ostree', '--repo=' + args.repo, 'rev-parse', args.buildroot])
+ rev = rev.strip()
self.metadata['buildroot'] = args.buildroot
self.metadata['buildroot-version'] = rev
diff --git a/src/ostbuild/pyostbuild/builtin_compile_one.py b/src/ostbuild/pyostbuild/builtin_compile_one.py
index cd2983d..d7fbd94 100755
--- a/src/ostbuild/pyostbuild/builtin_compile_one.py
+++ b/src/ostbuild/pyostbuild/builtin_compile_one.py
@@ -26,7 +26,7 @@ import select,time
from . import builtins
from .ostbuildlog import log, fatal
-from .subprocess_helpers import run_sync
+from .subprocess_helpers import run_sync, run_sync_get_output
PREFIX = '/usr'
@@ -100,7 +100,7 @@ class OstbuildCompileOne(builtins.Builtin):
self.metadata = {}
if self.ostbuild_meta is None:
- output = subprocess.check_output(['ostbuild', 'autodiscover-meta'])
+ output = run_sync_get_output(['ostbuild', 'autodiscover-meta'])
self.metadata = json.loads(output)
else:
f = open(self.ostbuild_meta)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]