[ARVADOS-DEV] updated: 48e6cb38b2e0c023589d4083192190bdc30c4762

git at public.curoverse.com git at public.curoverse.com
Wed Feb 3 08:19:42 EST 2016


Summary of changes:
 jenkins/run-library.sh | 6 ++++++
 1 file changed, 6 insertions(+)

       via  48e6cb38b2e0c023589d4083192190bdc30c4762 (commit)
      from  512193d7a3befd4172b5aa4685c01da84a690430 (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 48e6cb38b2e0c023589d4083192190bdc30c4762
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Feb 3 08:19:34 2016 -0500

    .deb dependencies from Python packages ignore iteration.
    
    See comment for rationale.
    Inspired by <https://github.com/curoverse/arvados/pull/35>.
    No issue #.

diff --git a/jenkins/run-library.sh b/jenkins/run-library.sh
index 83e0ea0..23ed383 100755
--- a/jenkins/run-library.sh
+++ b/jenkins/run-library.sh
@@ -218,6 +218,12 @@ fpm_build () {
   declare -a COMMAND_ARR=("fpm" "--maintainer=Ward Vandewege <ward at curoverse.com>" "-s" "$PACKAGE_TYPE" "-t" "$FORMAT")
   if [ python = "$PACKAGE_TYPE" ]; then
     COMMAND_ARR+=(--exclude=\*/{dist,site}-packages/tests/\*)
+    if [ deb = "$FORMAT" ]; then
+        # Dependencies are built from setup.py.  Since setup.py will never
+        # refer to Debian package iterations, it doesn't make sense to
+        # enforce those in the .deb dependencies.
+        COMMAND_ARR+=(--deb-ignore-iteration-in-dependencies)
+    fi
   fi
 
   if [[ "$PACKAGE_NAME" != "$PACKAGE" ]]; then

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list