Make hg pulls use URL from spec, not defaultbaserock/richardmaw/lars-url-change-fix

1 files changed, 6 insertions, 1 deletions

diff --git a/lorry b/lorry
index b802ebd..898ee4c 100755
--- a/lorry
+++ b/lorry
@@ -451,7 +451,12 @@ class Lorry(cliapp.Application):
         hgdir = os.path.join(dirname, 'hg')
         if os.path.exists(hgdir):
             self.progress('.. updating hg branch')
-            self.run_program(['hg', 'pull', '--quiet', '--insecure'], cwd=hgdir)
+
+            # Note that we always specify the URL from the spec, so
+            # that if the spec changes, we pick up the new URL.
+            self.run_program(
+                ['hg', 'pull', '--quiet', '--insecure', spec['url']],
+                cwd=hgdir)
         else:
             self.progress('.. doing initial hg branch')
             self.run_program(['hg', 'clone', '--quiet', '--insecure', spec['url'], hgdir])