[ARVADOS] updated: 1.1.0-54-g22a6e0d

Git user git at public.curoverse.com
Fri Oct 13 11:20:50 EDT 2017


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

       via  22a6e0d6c412765106e8ec6733729743becb7d99 (commit)
      from  de4ce53753593df32da017bafa10e431ebdf9537 (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 22a6e0d6c412765106e8ec6733729743becb7d99
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Fri Oct 13 12:20:41 2017 -0300

    12389: try to solve dep issue on packages accessing same dir
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 270225c..01ddded 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -387,7 +387,7 @@ fpm_build () {
   # section in the generated SPEC files. To remove DIRECTORIES, they need to
   # be listed in that sectiontoo, so we need to add this parameter to properly
   # remove lingering dirs.
-  if [[ rpm = "$FORMAT" ]]; then
+  if [[ rpm = "$FORMAT" ] && ["$PACKAGE_NAME"!= "python33-python-six"*]]; then
     COMMAND_ARR+=('--rpm-auto-add-directories')
   fi
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list