[ARVADOS] updated: 1.1.1-138-g070fed1

[Git user]

Summary of changes:
 build/run-library.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

  discards  57c07330f31183d81092bf1f8e3072a83723faf0 (commit)
       via  070fed19a16ca8466d2bc9b11d6fe3a7438a3aa6 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (57c07330f31183d81092bf1f8e3072a83723faf0)
            \
             N -- N -- N (070fed19a16ca8466d2bc9b11d6fe3a7438a3aa6)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 070fed19a16ca8466d2bc9b11d6fe3a7438a3aa6
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Dec 6 02:40:17 2017 -0500

    12721: Fix python package iteration and rails fpm invocation.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 51678e6..9898067 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -148,7 +148,7 @@ package_go_binary() {
 
     go get -ldflags "-X main.version=${version}" "git.curoverse.com/arvados.git/$src_path"
 
-    declare -a switches=()
+    local -a switches=()
     systemd_unit="$WORKSPACE/${src_path}/${prog}.service"
     if [[ -e "${systemd_unit}" ]]; then
         switches+=(
@@ -221,7 +221,9 @@ test_package_presence() {
         return 1
     fi
 
-    iteration="$(default_iteration "$pkgname" "$version" "$pkgtype")"
+    if [[ "$iteration" == "" || -n "$ARVADOS_BUILDING_VERSION" ]]; then
+        iteration="$(default_iteration "$pkgname" "$version" "$pkgtype")"
+    fi
 
     if [[ "$arch" == "" ]]; then
       rpm_architecture="x86_64"
@@ -275,6 +277,7 @@ handle_rails_package() {
         return 0
     fi
     local srcdir="$1"; shift
+    cd "$srcdir"
     local license_path="$1"; shift
     local version="$(version_from_git)"
     local scripts_dir="$(mktemp --tmpdir -d "$pkgname-XXXXXXXX.scripts")" && \
@@ -299,7 +302,7 @@ handle_rails_package() {
                        --before-remove "$scripts_dir/prerm"
                        --after-remove "$scripts_dir/postrm")
     if [[ -z "$ARVADOS_BUILDING_VERSION" ]]; then
-        switches+=(--iteration=$RAILS_PACKAGE_ITERATION)
+        switches+=(--iteration $RAILS_PACKAGE_ITERATION)
     fi
     # For some reason fpm excludes need to not start with /.
     local exclude_root="${railsdir#/}"

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


hooks/post-receive
--