diff options
Diffstat (limited to 'usr/src/tools/scripts')
| -rw-r--r-- | usr/src/tools/scripts/cddlchk.py | 2 | ||||
| -rw-r--r-- | usr/src/tools/scripts/copyrightchk.py | 2 | ||||
| -rw-r--r-- | usr/src/tools/scripts/git-pbchk.py | 6 | ||||
| -rw-r--r-- | usr/src/tools/scripts/hdrchk.py | 2 | ||||
| -rw-r--r-- | usr/src/tools/scripts/hg-active.py | 2 | ||||
| -rw-r--r-- | usr/src/tools/scripts/mapfilechk.py | 2 | ||||
| -rw-r--r-- | usr/src/tools/scripts/nightly.sh | 2 | ||||
| -rw-r--r-- | usr/src/tools/scripts/webrev.sh | 11 |
8 files changed, 15 insertions, 14 deletions
diff --git a/usr/src/tools/scripts/cddlchk.py b/usr/src/tools/scripts/cddlchk.py index 62a2695946..816d2f33a7 100644 --- a/usr/src/tools/scripts/cddlchk.py +++ b/usr/src/tools/scripts/cddlchk.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python2.6 # # CDDL HEADER START # diff --git a/usr/src/tools/scripts/copyrightchk.py b/usr/src/tools/scripts/copyrightchk.py index 1426a69bfa..210ef1b46c 100644 --- a/usr/src/tools/scripts/copyrightchk.py +++ b/usr/src/tools/scripts/copyrightchk.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python2.6 # # CDDL HEADER START # diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py index 74be6a4818..656e22f6b4 100644 --- a/usr/src/tools/scripts/git-pbchk.py +++ b/usr/src/tools/scripts/git-pbchk.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python2.6 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 @@ -140,13 +140,13 @@ def git_parent_branch(branch): def git_comments(parent): """Return a list of any checkin comments on this git branch""" - p = git('log --pretty=format:%%B %s..' % parent) + p = git('log --pretty=tformat:%%B:SEP: %s..' % parent) if not p: sys.stderr.write("Failed getting git comments\n") sys.exit(err) - return map(lambda x: x.strip(), p.readlines()) + return [x.strip() for x in p.readlines() if x != ':SEP:\n'] def git_file_list(parent, paths=None): diff --git a/usr/src/tools/scripts/hdrchk.py b/usr/src/tools/scripts/hdrchk.py index 3ecec6b3f2..84acbc8616 100644 --- a/usr/src/tools/scripts/hdrchk.py +++ b/usr/src/tools/scripts/hdrchk.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python2.6 # # CDDL HEADER START # diff --git a/usr/src/tools/scripts/hg-active.py b/usr/src/tools/scripts/hg-active.py index 7e49a18db5..88394e98e5 100644 --- a/usr/src/tools/scripts/hg-active.py +++ b/usr/src/tools/scripts/hg-active.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python2.6 # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 diff --git a/usr/src/tools/scripts/mapfilechk.py b/usr/src/tools/scripts/mapfilechk.py index 83d3d9d70c..9cf2000c7a 100644 --- a/usr/src/tools/scripts/mapfilechk.py +++ b/usr/src/tools/scripts/mapfilechk.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.4 +#!/usr/bin/python2.6 # # CDDL HEADER START # diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh index 9ecb8f471b..ef3ca0015b 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -2582,7 +2582,7 @@ echo | tee -a $build_environ_file >> $LOGFILE whence ld | tee -a $build_environ_file >> $LOGFILE LDVER=`ld -V 2>&1` echo $LDVER | tee -a $build_environ_file >> $LOGFILE -LDVER=`echo $LDVER | sed -e "s/.*-1\.//" -e "s/:.*//"` +LDVER=`echo $LDVER | sed -e "s/.*-1\.\([0-9]*\).*/\1/"` if [ `expr $LDVER \< 422` -eq 1 ]; then echo "The link-editor needs to be at version 422 or higher to build" | \ tee -a $build_environ_file >> $LOGFILE diff --git a/usr/src/tools/scripts/webrev.sh b/usr/src/tools/scripts/webrev.sh index 3b962ad917..afcab07abc 100644 --- a/usr/src/tools/scripts/webrev.sh +++ b/usr/src/tools/scripts/webrev.sh @@ -1806,11 +1806,11 @@ function git_wxfile chomp; if (/^R(\d+)\s+([^ ]+)\s+([^ ]+)/) { # rename if ($1 >= 75) { # Probably worth treating as a rename - $realfiles{$3} = $2 + $realfiles{$3} = $2; } else { $realfiles{$3} = $3; $realfiles{$2} = $2; - } + } } else { my $f = (split /\s+/, $_)[1]; $realfiles{$f} = $f; @@ -1826,7 +1826,8 @@ function git_wxfile my $fname = (split /\t/, $_)[1]; next if !defined($realfiles{$fname}); # No real change $state = 1; - $files{$fname} = $msg; + chomp $msg; + $files{$fname} .= $msg; } else { if ($state == 1) { $state = 0; @@ -1839,9 +1840,9 @@ function git_wxfile for (sort keys %files) { if ($realfiles{$_} ne $_) { - print "$_ $realfiles{$_}\n$files{$_}\n"; + print "$_ $realfiles{$_}\n$files{$_}\n\n"; } else { - print "$_\n$files{$_}\n" + print "$_\n$files{$_}\n\n" } }' ${parent} > $TMPFLIST |