aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-10-07 04:35:07 +0000
committerRob Austein <sra@hactrn.net>2014-10-07 04:35:07 +0000
commit14780587decc9f4fef4e9b44c797d0a91df80348 (patch)
tree010a41752a05cbed4b1beb5b1da3cfb9af9c91f5
parente3b6afdba7300602020fe225d9b6c0080e38a1a0 (diff)
Feh, [14,4] != (14,4).
svn path=/trunk/; revision=5996
-rw-r--r--buildtools/debian-skeleton/rpki-ca.prerm2
-rwxr-xr-xca/rpkigui-apache-conf-gen2
2 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/debian-skeleton/rpki-ca.prerm b/buildtools/debian-skeleton/rpki-ca.prerm
index c8387ac4..8b4d3945 100644
--- a/buildtools/debian-skeleton/rpki-ca.prerm
+++ b/buildtools/debian-skeleton/rpki-ca.prerm
@@ -78,7 +78,7 @@ case "$1" in
# Now remove the new stuff.
- /usr/lib/rpki/rpkigui-apache-conf-gen --debian --remove --verbose
+ /usr/lib/rpki/rpkigui-apache-conf-gen --remove --verbose
;;
diff --git a/ca/rpkigui-apache-conf-gen b/ca/rpkigui-apache-conf-gen
index a89111ca..27fa3e93 100755
--- a/ca/rpkigui-apache-conf-gen
+++ b/ca/rpkigui-apache-conf-gen
@@ -389,7 +389,7 @@ class Debian(Platform):
@property
def distribution_version(self):
- return [int(v) for v in platform.linux_distribution()[1].split(".")]
+ return tuple(int(v) for v in platform.linux_distribution()[1].split("."))
# As of Wheezy, Debian still wants the configuration filename
# without the .conf suffix. Keep an eye on this, as it may change