6638/7370: Force new builds of Python backports with dependencies.

Even though we've declared these dependencies for a while now, Jenkins
has not published packages with them, because without a new upstream
version, fpm believes that there's no new package to build.  This
resolves that by building a new iteration of the affected packages.

This is less than ideal, because if a new version is released, we'll
automatically package it with iteration 2.  That is not correct, but
it doesn't affect any functionality, and we already have a plan to do
things properly in #6885.  So we'll live with "correct functionality,
gross aesthetics" until then.

Ward approved in conversation.  Refs #6638, #7370.

diff --git a/backports/python-ciso8601/fpm-info.sh b/backports/python-ciso8601/fpm-info.sh
index 925a3757a25b449bab2dd67a2d4f2b521b948d62..42f31e365ca58f3add83cbba0bd73855d1190e30 100644 (file)
--- a/backports/python-ciso8601/fpm-info.sh
+++ b/backports/python-ciso8601/fpm-info.sh
@@ -6,3 +6,6 @@ case "$TARGET" in
         fpm_depends+=(libc6)
         ;;
 esac
+
+# FIXME: Remove this line after #6885 is done.
+fpm_args+=(--iteration 2)

diff --git a/backports/python-llfuse/fpm-info.sh b/backports/python-llfuse/fpm-info.sh
index c5783655b63558fb3988699981cf8634a0b61f4c..a7d9398701b7bc4c405027c26f5133fe7b23d383 100644 (file)
--- a/backports/python-llfuse/fpm-info.sh
+++ b/backports/python-llfuse/fpm-info.sh
@@ -8,3 +8,6 @@ case "$TARGET" in
         fpm_depends+=(libc6 libfuse2)
         ;;
 esac
+
+# FIXME: Remove this line after #6885 is done.
+fpm_args+=(--iteration 2)

diff --git a/backports/python-pycrypto/fpm-info.sh b/backports/python-pycrypto/fpm-info.sh
index cea7096395b8a5556d377f8f2e82732c8cf49f3f..52df46573da5fae9d1a87d14589f598bde198f0e 100644 (file)
--- a/backports/python-pycrypto/fpm-info.sh
+++ b/backports/python-pycrypto/fpm-info.sh
@@ -9,3 +9,6 @@ case "$TARGET" in
         fpm_depends+=(libc6)
         ;;
 esac
+
+# FIXME: Remove this line after #6885 is done.
+fpm_args+=(--iteration 2)

diff --git a/backports/python-pycurl/fpm-info.sh b/backports/python-pycurl/fpm-info.sh
index 4d2860f7b7d9e01994de7b72810a0eacda40abcb..e4fbf59344ec041875f016b8e7bf227420ce4fef 100644 (file)
--- a/backports/python-pycurl/fpm-info.sh
+++ b/backports/python-pycurl/fpm-info.sh
@@ -1,3 +1,6 @@
+# FIXME: Remove this line after #6885 is done.
+fpm_args+=(--iteration 2)
+
 case "$TARGET" in
     centos6)
             fpm_depends+=(