summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2010-05-27 16:05:13 -0600
committerJohn Wiegley <johnw@newartisans.com>2010-05-27 16:05:13 -0600
commit2fa3e50f081970b43b550f4c986eefb1298fd502 (patch)
tree53635a32688008624040015dff3d30716b2c74ca
parent04461f49fdc0f70d74172c77843be3e0a9fe313f (diff)
downloadledger-2fa3e50f081970b43b550f4c986eefb1298fd502.tar.gz
ledger-2fa3e50f081970b43b550f4c986eefb1298fd502.tar.bz2
ledger-2fa3e50f081970b43b550f4c986eefb1298fd502.zip
Fixed a sequencing problem in acprep
-rwxr-xr-xacprep12
1 files changed, 6 insertions, 6 deletions
diff --git a/acprep b/acprep
index 3c5a631b..a611e3e9 100755
--- a/acprep
+++ b/acprep
@@ -746,7 +746,7 @@ class PrepareBuild(CommandLineApp):
if system == 'Darwin':
if exists('/opt/local/bin/port'):
self.log.info('Looks like you are using MacPorts on OS X')
- packages = self.boost_info.dependencies('darwin') + [
+ packages = [
'sudo', 'port', 'install', '-f',
'automake',
'autoconf',
@@ -767,7 +767,7 @@ class PrepareBuild(CommandLineApp):
'texinfo',
'lcov',
'sloccount'
- ]
+ ] + self.boost_info.dependencies('darwin')
self.log.info('Executing: ' + string.join(packages, ' '))
self.execute(*packages)
elif exists('/sw/bin/fink'):
@@ -784,7 +784,7 @@ class PrepareBuild(CommandLineApp):
release.close()
if re.search('karmic', info):
self.log.info('Looks like you are using APT on Ubuntu Karmic')
- packages = self.boost_info.dependencies('ubuntu-karmic') + [
+ packages = [
'sudo', 'apt-get', 'install',
'build-essential',
'libtool',
@@ -805,10 +805,10 @@ class PrepareBuild(CommandLineApp):
'texinfo',
'lcov',
'sloccount'
- ]
+ ] + self.boost_info.dependencies('ubuntu-karmic')
else:
self.log.info('Looks like you are using APT on Ubuntu Hardy')
- packages = self.boost_info.dependencies('ubuntu-hardy') + [
+ packages = [
'sudo', 'apt-get', 'install',
'build-essential',
'libtool',
@@ -829,7 +829,7 @@ class PrepareBuild(CommandLineApp):
'texinfo',
'lcov',
'sloccount'
- ]
+ ] + self.boost_info.dependencies('ubuntu-hardy')
self.log.info('Executing: ' + string.join(packages, ' '))
self.execute(*packages)