[projects/cleanbuild] addbr can tell it added nothing (already present, etc)

[glen]

commit 1a32b5c6ccd7820714df598f97b37ecab78879e6
Author: Elan Ruusamäe <g...@pld-linux.org>
Date:   Wed Jun 14 23:18:43 2017 +0300

    addbr can tell it added nothing (already present, etc)

 addbr             | 2 +-
 docker-builder.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/addbr b/addbr
index b04afa6..6ab3dd4 100755
--- a/addbr
+++ b/addbr
@@ -30,7 +30,7 @@ foreach ( @in ) {
        if ( /^$brm$/o ) {
                if ( $1 eq $add ) {
                        warn "$add already on the list\n";
-                       exit;
+                       exit(1);
                }
        }
 
diff --git a/docker-builder.sh b/docker-builder.sh
index 2143d21..dab69e9 100755
--- a/docker-builder.sh
+++ b/docker-builder.sh
@@ -13,8 +13,8 @@ home=/home/services/builder
 buildsize="4G"
 
 # cleanup first
-docker kill $name || :
-docker rm $name || :
+docker kill $name >/dev/null 2>&1 || :
+docker rm $name >/dev/null 2>&1 || :
 
 install -d $topdir/logs
 
@@ -49,7 +49,7 @@ while true; do
 
        installed_something=false
        while read pkg msg; do
-               ./addbr rpm/packages/$package/$package.spec "$pkg" "$msg"
+               ./addbr rpm/packages/$package/$package.spec "$pkg" "$msg" || 
continue
                installed_something=true
        done < $findbr
        rm -f $findbr
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/cleanbuild.git/commitdiff/4f6e2b515b98ba137dfcde393db3db0658b4bfb8

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit