summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2014-06-01 12:16:28 (GMT)
committerKevin Smith <git@kismith.co.uk>2014-06-01 12:16:28 (GMT)
commit38d994aa83b068f93189e91fe466387759f7451b (patch)
treeba816eddff90064f89c2a825eda309d57118876c
parentbe915da04068a412dd63a597192ec3232ad4e1c2 (diff)
downloadswift-38d994aa83b068f93189e91fe466387759f7451b.zip
swift-38d994aa83b068f93189e91fe466387759f7451b.tar.bz2
Fix .deb packaging
Contcatenating the .. onto the filename breaks os.path.dirname. Change-Id: Ib018276166c9554c9adf53342d9c8bc5f954d13d
-rwxr-xr-xBuildTools/GetBuildVersion.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/GetBuildVersion.py b/BuildTools/GetBuildVersion.py
index 007fec8..fc92d15 100755
--- a/BuildTools/GetBuildVersion.py
+++ b/BuildTools/GetBuildVersion.py
@@ -11,11 +11,11 @@ if "--major" in sys.argv :
only_major = True
if only_major :
- v = Version.getBuildVersion(os.path.dirname(sys.argv[0] + "/.."), sys.argv[1])
+ v = Version.getBuildVersion(os.path.dirname(sys.argv[0]) + "/..", sys.argv[1])
version_match = re.match("(\d+)\.(\d+).*", v)
if version_match :
print version_match.group(1)
else :
print "0"
else :
- print Version.getBuildVersion(os.path.dirname(sys.argv[0] + "/.."), sys.argv[1])
+ print Version.getBuildVersion(os.path.dirname(sys.argv[0]) + "/..", sys.argv[1])