From fdecc8eb4da902cd527619f261a71a3fea8e2c56 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Mon, 22 Jun 2009 19:49:59 +0100 Subject: [PATCH] Removed --local option and made this the default Since the feed for the new binary is only visible to the user, there's no point putting the binary in the system store. --- autocompile.py | 10 +++------- tests/testcompile.py | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/autocompile.py b/autocompile.py index 43284dd..c4afb4c 100644 --- a/autocompile.py +++ b/autocompile.py @@ -173,12 +173,9 @@ class AutoCompiler: self.note("Implementation metadata written to %s" % local_feed) - store = policy.solver.iface_cache.stores - if self.options.local: - store = store.stores[0] - self.note("Storing build in local cache %s..." % store.dir) - else: - self.note("Storing build in cache...") + # No point adding it to the system store when only the user has the feed... + store = policy.solver.iface_cache.stores.stores[0] + self.note("Storing build in user cache %s..." % store.dir) policy.solver.iface_cache.stores.add_dir_to_cache(actual_digest, buildenv.distdir) self.note("Registering feed...") @@ -448,7 +445,6 @@ def do_autocompile(args): parser = OptionParser(usage="usage: %prog autocompile [options]") parser.add_option('', "--gui", help="graphical interface", action='store_true') - parser.add_option('', "--local", help="store in user cache, not system cache", action='store_true') (options, args2) = parser.parse_args(args) if len(args2) != 1: raise __main__.UsageError() diff --git a/tests/testcompile.py b/tests/testcompile.py index 0bd8065..08009f2 100755 --- a/tests/testcompile.py +++ b/tests/testcompile.py @@ -101,7 +101,7 @@ class TestCompile(unittest.TestCase): compile('publish', 'http://localhost/downloads', expect = "Now upload '%s.tar.bz2'" % archive_stem) def testAutocompile(self): - compile('autocompile', '--local', hello_uri, expect = "Registering feed...") + compile('autocompile', hello_uri, expect = "Registering feed...") run('0launch', hello_uri, expect = 'Hello, world!') def testLocal(self): -- 2.11.4.GIT