[Debian-l10n-commits] r1161 - in /ddtp-dinstall/trunk: Changelog checks/ddtp_i18n_check.sh

[faw at users.alioth.debian.org]

Author: faw
Date: Sun Aug 10 22:00:29 2008
New Revision: 1161

URL: http://svn.debian.org/wsvn/?sc=1&rev=1161
Log:
* checks/ddtp_i18n_check.sh: Commented out stable from the list of valid
  filenames.
* checks/ddtp_i18n_check.sh: Not removing SHA256SUMS, since we are now
  checking if files are valid.


Modified:
    ddtp-dinstall/trunk/Changelog
    ddtp-dinstall/trunk/checks/ddtp_i18n_check.sh

Modified: ddtp-dinstall/trunk/Changelog
URL: http://svn.debian.org/wsvn/ddtp-dinstall/trunk/Changelog?rev=1161&op=diff
==============================================================================
--- ddtp-dinstall/trunk/Changelog (original)
+++ ddtp-dinstall/trunk/Changelog Sun Aug 10 22:00:29 2008
@@ -1,3 +1,10 @@
+2008-08-10  Felipe Augusto van de Wiel  <faw at funlabs.org>
+
+	* checks/ddtp_i18n_check.sh: Commented out stable from the list of
+	valid filenames.
+	* checks/ddtp_i18n_check.sh: Not removing SHA256SUMS, since we are
+	now checking if files are valid.
+
 2008-08-10  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* tests/testsuite.sh: Updated testsuite script for the new

Modified: ddtp-dinstall/trunk/checks/ddtp_i18n_check.sh
URL: http://svn.debian.org/wsvn/ddtp-dinstall/trunk/checks/ddtp_i18n_check.sh?rev=1161&op=diff
==============================================================================
--- ddtp-dinstall/trunk/checks/ddtp_i18n_check.sh (original)
+++ ddtp-dinstall/trunk/checks/ddtp_i18n_check.sh Sun Aug 10 22:00:29 2008
@@ -71,14 +71,15 @@
 	case $ido_dir in
 		"$dists_parent_dir")                               return 0;;
 		"$dists_parent_dir/dists")                         return 0;;
-# FIXME: To be checked with the Stable Release Managers
-		"$dists_parent_dir/dists/$STABLE")                 return 0;;
-		"$dists_parent_dir/dists/$STABLE/main")            return 0;;
-		"$dists_parent_dir/dists/$STABLE/main/i18n")       return 0;;
-		"$dists_parent_dir/dists/$STABLE/contrib")         return 0;;
-		"$dists_parent_dir/dists/$STABLE/contrib/i18n")    return 0;;
-		"$dists_parent_dir/dists/$STABLE/non-free")        return 0;;
-		"$dists_parent_dir/dists/$STABLE/non-free/i18n")   return 0;;
+# TODO/FIXME: It is undecided how to update at stable/point-releases, so we
+#             don't allow files to $STABLE.
+#		"$dists_parent_dir/dists/$STABLE")                 return 0;;
+#		"$dists_parent_dir/dists/$STABLE/main")            return 0;;
+#		"$dists_parent_dir/dists/$STABLE/main/i18n")       return 0;;
+#		"$dists_parent_dir/dists/$STABLE/contrib")         return 0;;
+#		"$dists_parent_dir/dists/$STABLE/contrib/i18n")    return 0;;
+#		"$dists_parent_dir/dists/$STABLE/non-free")        return 0;;
+#		"$dists_parent_dir/dists/$STABLE/non-free/i18n")   return 0;;
 		"$dists_parent_dir/dists/$TESTING")                return 0;;
 		"$dists_parent_dir/dists/$TESTING/main")           return 0;;
 		"$dists_parent_dir/dists/$TESTING/main/i18n")      return 0;;
@@ -239,8 +240,13 @@
 	return 0
 }
 
+# Original SHA256SUMS, generated by i18n.debian.net
 SHA256SUMS="$dists_parent_dir/SHA256SUMS"
-rm -f "$SHA256SUMS"
+
+if sha256sum -c $SHA256SUMS; then
+	echo "sha256sum check failed!" >&2
+	exit 1
+fi
 
 # Get the list of valid packages (sorted, uniq)
 for t in $STABLE $TESTING $UNSTABLE; do
@@ -259,8 +265,21 @@
 			exit 1
 		fi
 	elif [ -f "$f" ]; then
+		# SHA256SUMS is a valid filename in dists_parent_dir
+		# We skip to the next loop because we won't check it for
+		# format, fields and encoding.
+		if [ "$f" = "$dists_parent_dir/$SHA256SUMS" ]; then
+			continue 
+		fi
+
 		if ! is_filename_okay "$f"; then
 			echo "Wrong file: $f" >&2
+			exit 1
+		fi
+
+		# Check if the file exists inside SHA256SUMS
+		if ! grep -q $f $SHA256SUMS; then
+			echo "File $f is not in SHA256SUMS ($SHA256SUMS)"
 			exit 1
 		fi
 
@@ -297,8 +316,6 @@
 		#   Compress the file
 		bzip2 -c "$f" > "$f.bz2"
 		gzip  -c "$f" > "$f.gz"
-		#   Add its sha256sum to ...
-		sha256sum "$f" "$f.gz" "$f.bz2" >> "$SHA256SUMS"
 	else
 		echo "Neither a file or directory: $f" >&2
 		exit 1