[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/8] gnulib: update
From: |
Akim Demaille |
Subject: |
[PATCH 5/8] gnulib: update |
Date: |
Tue, 19 Feb 2013 17:50:38 +0100 |
---
bootstrap | 44 ++++++++++++++++++++++----------------------
gnulib | 2 +-
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/bootstrap b/bootstrap
index 012907a..bee7765 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2012-12-28.10; # UTC
+scriptversion=2013-01-20.16; # UTC
# Bootstrap this package from checked-out sources.
@@ -306,34 +306,34 @@ if test -n "$checkout_only_file" && test ! -r
"$checkout_only_file"; then
die "Bootstrapping from a non-checked-out distribution is risky."
fi
-# Ensure that lines starting with ! sort last, per gitignore conventions
-# for whitelisting exceptions after a more generic blacklist pattern.
-sort_patterns() {
- sort -u "$@" | sed '/^!/ {
- H
- d
- }
- $ {
- P
- x
- s/^\n//
- }' | sed '/^$/d'
+# Strip blank and comment lines to leave significant entries.
+gitignore_entries() {
+ sed '/^#/d; /^$/d' "$@"
}
-# If $STR is not already on a line by itself in $FILE, insert it,
-# sorting the new contents of the file and replacing $FILE with the result.
-insert_sorted_if_absent() {
+# If $STR is not already on a line by itself in $FILE, insert it at the start.
+# Entries are inserted at the start of the ignore list to ensure existing
+# entries starting with ! are not overridden. Such entries support
+# whitelisting exceptions after a more generic blacklist pattern.
+insert_if_absent() {
file=$1
str=$2
test -f $file || touch $file
- echo "$str" | sort_patterns - $file | cmp -s - $file > /dev/null \
- || { echo "$str" | sort_patterns - $file > $file.bak \
- && mv $file.bak $file; } \
- || die "insert_sorted_if_absent $file $str: failed"
+ test -r $file || die "Error: failed to read ignore file: $file"
+ duplicate_entries=$(gitignore_entries $file | sort | uniq -d)
+ if [ "$duplicate_entries" ] ; then
+ die "Error: Duplicate entries in $file: " $duplicate_entries
+ fi
+ linesold=$(gitignore_entries $file | wc -l)
+ linesnew=$(echo "$str" | gitignore_entries - $file | sort -u | wc -l)
+ if [ $linesold != $linesnew ] ; then
+ { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \
+ || die "insert_if_absent $file $str: failed"
+ fi
}
# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
-# insert_sorted_if_absent.
+# insert_if_absent.
insert_vc_ignore() {
vc_ignore_file="$1"
pattern="$2"
@@ -344,7 +344,7 @@ insert_vc_ignore() {
# .gitignore entry.
pattern=$(echo "$pattern" | sed s,^,/,);;
esac
- insert_sorted_if_absent "$vc_ignore_file" "$pattern"
+ insert_if_absent "$vc_ignore_file" "$pattern"
}
# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
diff --git a/gnulib b/gnulib
index c67e3c0..38e8c08 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit c67e3c0414da820f845c9c91c105094e87d865d0
+Subproject commit 38e8c084b95e98c4e763df8cfc43a141aa93fc5f
--
1.8.1.3
- [PATCH 0/8] {master} various clean ups, Akim Demaille, 2013/02/19
- [PATCH 8/8] tests: fix invalid C++11 code, Akim Demaille, 2013/02/19
- [PATCH 4/8] style: rename variant private members, Akim Demaille, 2013/02/19
- [PATCH 3/8] style: space changes, Akim Demaille, 2013/02/19
- [PATCH 1/8] news: spell fixes, Akim Demaille, 2013/02/19
- [PATCH 2/8] variant: fix G++ 4.4 warnings, Akim Demaille, 2013/02/19
- [PATCH 7/8] tests: fix failures with G++ 4.8 in Flex scanner, Akim Demaille, 2013/02/19
- [PATCH 6/8] regen, Akim Demaille, 2013/02/19
- [PATCH 5/8] gnulib: update,
Akim Demaille <=