|
4 | 4 | from commands import getstatusoutput
|
5 | 5 | except ImportError:
|
6 | 6 | from subprocess import getstatusoutput
|
| 7 | +from alibuild_helpers import __version__ |
7 | 8 | from alibuild_helpers.analytics import report_event
|
8 | 9 | from alibuild_helpers.log import debug, error, info, banner, warning
|
9 | 10 | from alibuild_helpers.log import dieOnError
|
@@ -52,12 +53,8 @@ def readHashFile(fn):
|
52 | 53 | return "0"
|
53 | 54 |
|
54 | 55 | def getDirectoryHash(d):
|
55 |
| - if exists(join(d, ".git")): |
56 |
| - err, out = getstatusoutput("GIT_DIR=%s/.git git rev-parse HEAD" % d) |
57 |
| - dieOnError(err, "Impossible to find reference for %s " % d) |
58 |
| - else: |
59 |
| - err, out = getstatusoutput("pip --disable-pip-version-check show alibuild | grep -e \"^Version:\" | sed -e 's/.* //'") |
60 |
| - dieOnError(err, "Impossible to find reference for %s " % d) |
| 56 | + err, out = getstatusoutput("cd %s && git rev-parse HEAD" % d) |
| 57 | + dieOnError(err, "Impossible to find reference for %s" % d) |
61 | 58 | return out
|
62 | 59 |
|
63 | 60 | # Creates a directory in the store which contains symlinks to the package
|
@@ -272,8 +269,7 @@ def doBuild(args, parser):
|
272 | 269 | debug("Building for architecture %s", args.architecture)
|
273 | 270 | debug("Number of parallel builds: %d", args.jobs)
|
274 | 271 | debug("Using %sBuild from %sbuild@%s recipes in %sdist@%s",
|
275 |
| - star(), star(), getDirectoryHash(dirname(__file__)), star(), |
276 |
| - os.environ["ALIBUILD_ALIDIST_HASH"]) |
| 272 | + star(), star(), __version__, star(), os.environ["ALIBUILD_ALIDIST_HASH"]) |
277 | 273 |
|
278 | 274 | def get_status(cmd):
|
279 | 275 | if dockerImage is not None:
|
|
0 commit comments