[pypy-svn] buildbot commit e1a455c64220: Replace the ':' with a '-' in the file names.

Bitbucket commits-noreply at bitbucket.org
Wed Dec 15 17:03:00 CET 2010


# HG changeset patch -- Bitbucket.org
# Project buildbot
# URL http://bitbucket.org/pypy/buildbot/overview
# User Armin Rigo <arigo at tunes.org>
# Date 1292428971 -3600
# Node ID e1a455c64220c8dab8e0af7538ebf5c33c35a3b0
# Parent  a74427a0066fb78c0bfee255a6c49679aec47f80
Replace the ':' with a '-' in the file names.

--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -197,16 +197,20 @@ class Translated(factory.BuildFactory):
                 kind = 'stackless'
             else:
                 kind = 'nojit'
-        name = 'pypy-c-' + kind + '-%(got_revision)s-' + platform
+        #
+        properties = self.build.getProperties()
+        rev = properties.get('got_revision', 'unknownrev')
+        rev = rev.replace(':', '-')    # don't use ':' in file names
+        name = 'pypy-c-%s-%s-%s' % (kind, rev, platform)
         self.addStep(ShellCmd(
             description="compress pypy-c",
             command=["python", "pypy/tool/release/package.py",
-                     ".", WithProperties(name), 'pypy',
+                     ".", name, 'pypy',
                      '.'],
             workdir='build'))
         nightly = '~/nightly/'
         pypy_c_rel = "build/" + name + ".tar.bz2"
-        self.addStep(PyPyUpload(slavesrc=WithProperties(pypy_c_rel),
+        self.addStep(PyPyUpload(slavesrc=pypy_c_rel,
                                 masterdest=WithProperties(nightly),
                                 basename=name + ".tar.bz2",
                                 workdir='.',



More information about the Pypy-commit mailing list