aboutsummaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2013-02-19 02:20:28 +0000
committerRob Austein <sra@hactrn.net>2013-02-19 02:20:28 +0000
commit56187bbc7b45fce4e6dca9716cbed81141d9c01f (patch)
treeb8be2d0c68031851e949733fa7c337b49696670f /buildtools
parent468123b8c7ccb6c22fb27e051195623444ed031f (diff)
Get rid of silly "r" prefix on version number for FreeBSD packages,
among other reasons so that we can have the same version numbers on FreeBSD and Ubuntu, doh. svn path=/branches/tk377/; revision=5042
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/build-freebsd-ca-port.py2
-rw-r--r--buildtools/build-freebsd-rp-port.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/buildtools/build-freebsd-ca-port.py b/buildtools/build-freebsd-ca-port.py
index c711b16c..ad4865e0 100644
--- a/buildtools/build-freebsd-ca-port.py
+++ b/buildtools/build-freebsd-ca-port.py
@@ -65,6 +65,8 @@ if branch != "trunk" and (branch[:2] != "tk" or not branch[2:].isdigit()):
if not vers.isdigit() and (base != "rpki" or vers[0] != "r" or not vers[1:].isdigit()):
vers = None
+else:
+ vers = vers[1:]
if None in (base, branch, vers):
sys.exit("Unexpected tarball URL name format")
diff --git a/buildtools/build-freebsd-rp-port.py b/buildtools/build-freebsd-rp-port.py
index 59bce18e..bbb5ceb3 100644
--- a/buildtools/build-freebsd-rp-port.py
+++ b/buildtools/build-freebsd-rp-port.py
@@ -65,6 +65,8 @@ if branch != "trunk" and (branch[:2] != "tk" or not branch[2:].isdigit()):
if not vers.isdigit() and (base != "rpki" or vers[0] != "r" or not vers[1:].isdigit()):
vers = None
+else:
+ vers = vers[1:]
if None in (base, branch, vers):
sys.exit("Unexpected tarball URL name format")