]> git.pld-linux.org Git - packages/rpm-build-tools.git/commitdiff
- fix branch support when no branch is specified
authorJan Rękorajski <baggins@pld-linux.org>
Fri, 10 Apr 2015 18:30:26 +0000 (20:30 +0200)
committerJan Rękorajski <baggins@pld-linux.org>
Fri, 10 Apr 2015 18:30:26 +0000 (20:30 +0200)
relup.sh

index 9bf8fa78d39064f271c382f9f000a1103f22c1c1..7557ba619b1282596364914aa6d253ba8159fbea 100755 (executable)
--- a/relup.sh
+++ b/relup.sh
@@ -92,7 +92,11 @@ get_branch() {
 
        branch=${specfile#*:}
 
-       echo ${branch:-master}
+       if [ "$branch" != "$specfile" ]; then
+               echo "$branch"
+       else
+               echo ""
+       fi
 }
 
 if [ ! -x /usr/bin/getopt ]; then
@@ -160,13 +164,21 @@ for pkg in "$@"; do
        specname=${spec##*/}
 
        # start real work
-       echo "$pkg:$branch ..."
+       if [ -n "$branch" ]; then
+               echo "$pkg:$branch ..."
+       else
+               echo "$pkg ..."
+       fi
 
        # get package
        [ "$get" = 1 -a -d "$pkgdir" ] && continue
 
        if [ "$update" = "1" -o "$get" = "1" ]; then
-               ./builder -g -ns "$spec" -r $branch
+               if [ -n "$branch" ]; then
+                       ./builder -g -ns "$spec" -r $branch
+               else
+                       ./builder -g -ns "$spec"
+               fi
        fi
 
        [ "$get" = 1 ] && continue
This page took 0.051037 seconds and 4 git commands to generate.