[ARVADOS] updated: 55cf82d6111afcbb54714fbb4be9f1ffe642d6ef

[git at public.curoverse.com]

Summary of changes:
 sdk/python/setup.py           |  1 +
 services/fuse/setup.py        |  1 +
 services/nodemanager/setup.py | 32 ++++++++++++++++++++------------
 3 files changed, 22 insertions(+), 12 deletions(-)

       via  55cf82d6111afcbb54714fbb4be9f1ffe642d6ef (commit)
      from  992ddfa686f54799e0cee1690e7c59ceb98977f9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 55cf82d6111afcbb54714fbb4be9f1ffe642d6ef
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Nov 20 16:33:49 2014 -0500

    4400: Fix whitespace. Fix tagging in nodemanager, too.

diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index c83617e..d96053d 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -27,6 +27,7 @@ class TagBuildWithCommit(egg_info):
             self.tag_build = '.{}.{}'.format(*git_tags)
         return egg_info.tags(self)
 
+
 setup(name='arvados-python-client',
       version='0.1',
       description='Arvados client library',
diff --git a/services/fuse/setup.py b/services/fuse/setup.py
index 3af3c84..a1b1dca 100644
--- a/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@ -27,6 +27,7 @@ class TagBuildWithCommit(egg_info):
             self.tag_build = '.{}.{}'.format(*git_tags)
         return egg_info.tags(self)
 
+
 setup(name='arvados_fuse',
       version='0.1',
       description='Arvados FUSE driver',
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 44a35f5..a687c82 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -5,19 +5,27 @@ import subprocess
 import time
 
 from setuptools import setup, find_packages
+from setuptools.command.egg_info import egg_info
 
 SETUP_DIR = os.path.dirname(__file__) or "."
-cmd_opts = {'egg_info': {}}
-try:
-    git_tags = subprocess.check_output(
-        ['git', 'log', '--first-parent', '--max-count=1',
-         '--format=format:%ct %h', SETUP_DIR]).split()
-    assert len(git_tags) == 2
-except (AssertionError, OSError, subprocess.CalledProcessError):
-    pass
-else:
-    git_tags[0] = time.strftime('%Y%m%d%H%M%S', time.gmtime(int(git_tags[0])))
-    cmd_opts['egg_info']['tag_build'] = '.{}.{}'.format(*git_tags)
+
+class TagBuildWithCommit(egg_info):
+    """Tag the build with the sha1 and date of the last git commit.
+
+    If a build tag has already been set (e.g., "egg_info -b", building
+    from source package), leave it alone.
+    """
+    def tags(self):
+        if self.tag_build is None:
+            git_tags = subprocess.check_output(
+                ['git', 'log', '--first-parent', '--max-count=1',
+                 '--format=format:%ct %h', SETUP_DIR]).split()
+            assert len(git_tags) == 2
+            git_tags[0] = time.strftime(
+                '%Y%m%d%H%M%S', time.gmtime(int(git_tags[0])))
+            self.tag_build = '.{}.{}'.format(*git_tags)
+        return egg_info.tags(self)
+
 
 setup(name='arvados-node-manager',
       version='0.1',
@@ -38,5 +46,5 @@ setup(name='arvados-node-manager',
       test_suite='tests',
       tests_require=['mock>=1.0'],
       zip_safe=False,
-      options=cmd_opts,
+      cmdclass={'egg_info': TagBuildWithCommit},
       )

-----------------------------------------------------------------------


hooks/post-receive
--