NEWS

 =================
-buildstream 1.3.1
+buildstream 1.1.5
 =================
 
   o Add a `--tar` option to `bst checkout` which allows a tarball to be
@@ -9,6 +9,8 @@ buildstream 1.3.1
     and the preferred mirror to fetch from can be defined in the command
     line or user config.
 
+  o Added new `remote` source plugin for downloading file blobs
+
 =================
 buildstream 1.1.4
 =================

buildstream/buildelement.py

 #
 #  Copyright (C) 2016 Codethink Limited
+#  Copyright (C) 2018 Bloomberg Finance LP
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -204,8 +205,9 @@ class BuildElement(Element):
     def prepare(self, sandbox):
         commands = self.__commands['configure-commands']
         if commands:
-            for cmd in commands:
-                self.__run_command(sandbox, cmd, 'configure-commands')
+            with self.timed_activity("Running configure-commands"):
+                for cmd in commands:
+                    self.__run_command(sandbox, cmd, 'configure-commands')
 
     def generate_script(self):
         script = ""
@@ -231,13 +233,12 @@ class BuildElement(Element):
         return commands
 
     def __run_command(self, sandbox, cmd, cmd_name):
-        with self.timed_activity("Running {}".format(cmd_name)):
-            self.status("Running {}".format(cmd_name), detail=cmd)
-
-            # Note the -e switch to 'sh' means to exit with an error
-            # if any untested command fails.
-            #
-            exitcode = sandbox.run(['sh', '-c', '-e', cmd + '\n'],
-                                   SandboxFlags.ROOT_READ_ONLY)
-            if exitcode != 0:
-                raise ElementError("Command '{}' failed with exitcode {}".format(cmd, exitcode))
+        self.status("Running {}".format(cmd_name), detail=cmd)
+
+        # Note the -e switch to 'sh' means to exit with an error
+        # if any untested command fails.
+        #
+        exitcode = sandbox.run(['sh', '-c', '-e', cmd + '\n'],
+                               SandboxFlags.ROOT_READ_ONLY)
+        if exitcode != 0:
+            raise ElementError("Command '{}' failed with exitcode {}".format(cmd, exitcode))

buildstream/plugins/sources/git.py

@@ -71,6 +71,7 @@ git - stage files from a git repository
 """
 
 import os
+import errno
 import re
 import shutil
 from collections import Mapping
@@ -119,11 +120,21 @@ class GitMirror(SourceFetcher):
                                  fail="Failed to clone git repository {}".format(url),
                                  fail_temporarily=True)
 
+                # Attempt atomic rename into destination, this will fail if
+                # another process beat us to the punch
                 try:
-                    shutil.move(tmpdir, self.mirror)
-                except (shutil.Error, OSError) as e:
-                    raise SourceError("{}: Failed to move cloned git repository {} from '{}' to '{}'"
-                                      .format(self.source, url, tmpdir, self.mirror)) from e
+                    os.rename(tmpdir, self.mirror)
+                except OSError as e:
+
+                    # When renaming and the destination repo already exists, os.rename()
+                    # will fail with ENOTEMPTY, since an empty directory will be silently
+                    # replaced
+                    if e.errno == errno.ENOTEMPTY:
+                        self.source.status("{}: Discarding duplicate clone of {}"
+                                           .format(self.source, url))
+                    else:
+                        raise SourceError("{}: Failed to move cloned git repository {} from '{}' to '{}': {}"
+                                          .format(self.source, url, tmpdir, self.mirror, e)) from e
 
     def _fetch(self, alias_override=None):
         url = self.source.translate_url(self.url, alias_override=alias_override)

buildstream/source.py

@@ -148,7 +148,7 @@ class SourceFetcher():
     places (e.g. a git source with submodules) has a consistent interface for
     fetching and substituting aliases.
 
-    *Since: 1.4*
+    *Since: 1.2*
     """
     def __init__(self):
         self.__alias = None
@@ -382,7 +382,7 @@ class Source(Plugin):
         Args:
            url (str): The url used to download
 
-        *Since: 1.4*
+        *Since: 1.2*
         """
         alias, _ = url.split(utils._ALIAS_SEPARATOR, 1)
         self.__expected_alias = alias
@@ -398,7 +398,7 @@ class Source(Plugin):
            list: A list of SourceFetchers. If SourceFetchers are not supported,
                  this will be an empty list.
 
-        *Since: 1.4*
+        *Since: 1.2*
         """
 
         return []
@@ -425,7 +425,7 @@ class Source(Plugin):
 
         Args:
            url (str): A url, which may be using an alias
-           alias_override (str): Optionally, an URI to override the alias with. (*Since: 1.4*)
+           alias_override (str): Optionally, an URI to override the alias with. (*Since: 1.2*)
 
         Returns:
            str: The fully qualified url, with aliases resolved