[ARVADOS] updated: c271c93ccc5f6f187974d6a11c035652d6488401

git at public.curoverse.com git at public.curoverse.com
Fri Oct 30 15:12:14 EDT 2015


Summary of changes:
 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(+)

       via  c271c93ccc5f6f187974d6a11c035652d6488401 (commit)
      from  8dea5d629b93c1a8201cd347be19fc6f48239622 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c271c93ccc5f6f187974d6a11c035652d6488401
Author: Brett Smith <brett at curoverse.com>
Date:   Fri Oct 30 15:12:04 2015 -0400

    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 925a375..42f31e3 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 c578365..a7d9398 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 cea7096..52df465 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 4d2860f..e4fbf59 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+=(

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list