Author: guillem
Date: 2006-05-04 05:27:03 +0000 (Thu, 04 May 2006)
New Revision: 273
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/install-info.pl
Log:
Use the numerical value of errno instead of a string in install-info
when checking if the locking error was due to an already existing
file, which is locale dependent, and die accordingly. Based on a patch
by Nicolas Fran?\195?\131?\194?\167ois. Closes: #199204, #210781
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-05-04 04:48:54 UTC (rev 272)
+++ trunk/ChangeLog 2006-05-04 05:27:03 UTC (rev 273)
@@ -1,3 +1,10 @@
+2006-05-04 Nicolas François <[EMAIL PROTECTED]>,
+ Guillem Jover <[EMAIL PROTECTED]>
+
+ * scripts/install-info.pl: Use the numerical value of $! instead of
+ the string when checking if the locking error was due to an already
+ existing file, which is locale dependent, and die accordingly.
+
2006-05-04 Nicolas François <[EMAIL PROTECTED]>
* scripts/install-info.pl: Add a new line after adding the last
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-04 04:48:54 UTC (rev 272)
+++ trunk/debian/changelog 2006-05-04 05:27:03 UTC (rev 273)
@@ -49,6 +49,10 @@
* Make install-info add a new line after adding the last entry at the
end of the dir file, which makes the info readers able to see those
last enties (Nicolas François). Closes: #164495
+ * Use the numerical value of errno instead of a string in install-info
+ when checking if the locking error was due to an already existing
+ file, which is locale dependent, and die accordingly. Based on a patch
+ by Nicolas François. Closes: #199204, #210781
-- Jacobo Tarrio <[EMAIL PROTECTED]> Wed, 3 May 2006 11:50:59 +0200
Modified: trunk/scripts/install-info.pl
===================================================================
--- trunk/scripts/install-info.pl 2006-05-04 04:48:54 UTC (rev 272)
+++ trunk/scripts/install-info.pl 2006-05-04 05:27:03 UTC (rev 273)
@@ -273,8 +273,8 @@
}
if (!$nowrite && !link($dirfile, "$dirfile.lock")) {
- print STDERR "$name: failed to lock dir for editing! $!\n".
- ($! =~ m/exists/i ? "try deleting $dirfile.lock ?\n" : '');
+ die "$name: failed to lock dir for editing! $!\n".
+ ($! == EEXIST ? "try deleting $dirfile.lock ?\n" : '');
}
open(OLD, $dirfile) || &ulquit("open $dirfile: $!");
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
