[Parted-commits] GNU Parted Official Repository: Changes to 'master'

[Jim Meyering]

 bootstrap         |   17 +++++++++++------
 gnulib            |    2 +-
 tests/Makefile.am |    3 ++-
 tests/init.sh     |    9 ++++++---
 4 files changed, 20 insertions(+), 11 deletions(-)

New commits:
commit feaa8f3fd279a5eb3adb16d8cfe863328a5e3222
Author: Jim Meyering <meyering at redhat.com>
Date:   Wed Aug 18 18:52:02 2010 -0400

    avoid non-srcdir "make check" failure
    
    * tests/Makefile.am (EXTRA_DIST): Add init.cfg.
    The failure was introduced by commit 6f7c0f12.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b31a513..702c150 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -48,7 +48,8 @@ TESTS = \
   t9040-many-partitions.sh
 
 EXTRA_DIST = \
-  $(TESTS) test-lib.sh t-lib.sh lvm-utils.sh t-local.sh t-lvm.sh init.sh
+  $(TESTS) test-lib.sh t-lib.sh lvm-utils.sh t-local.sh t-lvm.sh \
+  init.cfg init.sh
 
 check_PROGRAMS = print-align print-max dup-clobber
 LDADD = \

commit d12981ce204e1970e9a30edf069a8345e37c6a9f
Author: Jim Meyering <meyering at redhat.com>
Date:   Wed Aug 18 18:39:53 2010 -0400

    build and tests: update bootstrap and init.sh from gnulib
    
    * tests/init.sh: Update from gnulib.
    * bootstrap: Likewise.

diff --git a/bootstrap b/bootstrap
index e55b3d2..5ab4cf7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-04-30.16; # UTC
+scriptversion=2010-07-06.10; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -90,7 +90,8 @@ bootstrap_epilogue() { :; }
 # options because the latest/%s directory and the .po files within are
 # all symlinks.
 po_download_command_format=\
-"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
+"rsync --delete --exclude '*.s1' -Lrtvz \
+ 'translationproject.org::tp/latest/%s/' '%s'"
 
 extract_package_name='
   /^AC_INIT(/{
@@ -409,6 +410,7 @@ git_modules_config () {
 }
 
 gnulib_path=`git_modules_config submodule.gnulib.path`
+: ${gnulib_path=gnulib}
 
 # Get gnulib files.
 
@@ -424,7 +426,8 @@ case ${GNULIB_SRCDIR--} in
 
     trap cleanup_gnulib 1 2 13 15
 
-    git clone -h|grep -- --depth > /dev/null && shallow='--depth 2' || shallow=
+    shallow=
+    git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
     git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
       cleanup_gnulib
 
@@ -473,22 +476,24 @@ download_po_files() {
   eval "$cmd"
 }
 
-# Download .po files to $po_dir/.reference and copy only the new
+# Mirror .po files to $po_dir/.reference and copy only the new
 # or modified ones into $po_dir.  Also update $po_dir/LINGUAS.
+# Note po files that exist locally only are left in $po_dir but will
+# not be included in LINGUAS and hence will not be distributed.
 update_po_files() {
   # Directory containing primary .po files.
   # Overwrite them only when we're sure a .po file is new.
   po_dir=$1
   domain=$2
 
-  # Download *.po files into this dir.
+  # Mirror *.po files into this dir.
   # Usually contains *.s1 checksum files.
   ref_po_dir="$po_dir/.reference"
 
   test -d $ref_po_dir || mkdir $ref_po_dir || return
   download_po_files $ref_po_dir $domain \
     && ls "$ref_po_dir"/*.po 2>/dev/null |
-      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
+      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
 
   langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
   test "$langs" = '*' && langs=x
diff --git a/tests/init.sh b/tests/init.sh
index 7943526..bc82d69 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -255,9 +255,9 @@ setup_()
     || fail_ "failed to create temporary directory in $initial_cwd_"
   cd "$test_dir_"
 
-  # These trap statements ensure that the temporary directory, $test_dir_,
-  # is removed upon exit as well as upon receipt of any of the listed signals.
-  trap remove_tmp_ 0
+  # This trap statement, along with a trap on 0 below, ensure that the
+  # temporary directory, $test_dir_, is removed upon exit as well as
+  # upon receipt of any of the listed signals.
   for sig_ in 1 2 3 13 15; do
     eval "trap 'Exit $(expr $sig_ + 128)' $sig_"
   done
@@ -385,3 +385,6 @@ test -f "$srcdir/init.cfg" \
   && . "$srcdir/init.cfg"
 
 setup_ "$@"
+# This trap is here, rather than in the setup_ function, because some
+# shells run the exit trap at shell function exit, rather than script exit.
+trap remove_tmp_ 0

commit 01911cf833d84945e19dc39cdfb3878d813063af
Author: Jim Meyering <meyering at redhat.com>
Date:   Wed Aug 18 17:41:43 2010 -0400

    build: update gnulib submodule to latest

diff --git a/gnulib b/gnulib
index afc6cbe..3f08220 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit afc6cbe4fe4892c5ee4166cab87fede6f294a27d
+Subproject commit 3f08220c1a263dfc45f6e0ce6dcee97631dd5e56