From c271c93ccc5f6f187974d6a11c035652d6488401 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Fri, 30 Oct 2015 15:12:04 -0400 Subject: [PATCH] 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. --- backports/python-ciso8601/fpm-info.sh | 3 +++ backports/python-llfuse/fpm-info.sh | 3 +++ backports/python-pycrypto/fpm-info.sh | 3 +++ backports/python-pycurl/fpm-info.sh | 3 +++ 4 files changed, 12 insertions(+) diff --git a/backports/python-ciso8601/fpm-info.sh b/backports/python-ciso8601/fpm-info.sh index 925a3757a2..42f31e365c 100644 --- 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 c5783655b6..a7d9398701 100644 --- 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 cea7096395..52df46573d 100644 --- 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 4d2860f7b7..e4fbf59344 100644 --- 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+=( -- 2.39.5