[packages/rpm-build-tools] Fix bashism in insert_gitlog

draenog draenog at pld-linux.org
Mon Jul 9 16:12:53 CEST 2012


commit fafbe55976392eca3721013f1fa058f47bd87043
Author: Kącper Kornet <draenog at pld-linux.org>
Date:   Mon Jul 9 15:07:53 2012 +0100

    Fix bashism in insert_gitlog
    
    When ksh is from pdksh it fixes the following problem:
    
    Cloning into 'ftdi_eeprom'...
    remote: Counting objects: 9, done.
    remote: Compressing objects: 100% (4/4), done.
    remote: Total 9 (delta 2), reused 9 (delta 2)
    Receiving objects: 100% (9/9), done.
    Resolving deltas: 100% (2/2), done.
    Available branches: master
    /usr/bin/builder[2682]: cannot open mirrors: No such file or directory
    error: No note found for object
    91306a1ca4c6e7f24369684449628be02eef0ef6.
    error: No note found for object
    8ed8fa91a4773cb0d7b5078b0d91a5781bb31b7b.
    error: No note found for object
    f4a56f57a28c4e5911bc0a4be2a75f94d00b0667.

 builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/builder.sh b/builder.sh
index f634e61..594fce3 100755
--- a/builder.sh
+++ b/builder.sh
@@ -452,7 +452,7 @@ insert_gitlog() {
 	# * 1265749244 +0000 Random Hacker <nikt at pld-linux.org> 9370900
 	git rev-list -${log_entries:-20} HEAD | while read sha1; do
 		local logfmt='%B%n'
-		git notes list $sha1 &> /dev/null && logfmt=%N
+		git notes list $sha1 > /dev/null 2>&1 && logfmt=%N
 		git log -n 1 $sha1 --format=format:"* %ad %an <%ae> %h%n${logfmt}%n" --date=raw | sed '/^$/q'
 	done > $gitlog
 	LC_ALL=C gawk '/^\* /{printf("* %s %s\n", strftime("%a %b %d %Y", $2), substr($0, length($1)+length($2)+length($3)+4)); next}{print}' $gitlog > $speclog


More information about the pld-cvs-commit mailing list