Author: adam-guest
Date: 2008-04-02 19:19:35 +0000 (Wed, 02 Apr 2008)
New Revision: 1234

Modified:
   trunk/debian/changelog
   trunk/scripts/debchange.pl
Log:
debchange: Fix spurious output when adding a changelog entry containing
non-ASCII characters (Closes: #473769)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2008-04-02 05:56:46 UTC (rev 1233)
+++ trunk/debian/changelog      2008-04-02 19:19:35 UTC (rev 1234)
@@ -22,6 +22,8 @@
     + Add a test for export being passed options other than -p
       (Closes: #473700)
   * dcmd: Apply patch from Romain to correctly match the x11 section
+  * debchange: Fix spurious output when adding a changelog entry containing
+    non-ASCII characters (Closes: #473769)
   * debcheckout:
     + Tighten the "repository owner" regex for darcs.d.o to correctly check
       http://darcs.d.o/~foo/bar/baz against user foo

Modified: trunk/scripts/debchange.pl
===================================================================
--- trunk/scripts/debchange.pl  2008-04-02 05:56:46 UTC (rev 1233)
+++ trunk/scripts/debchange.pl  2008-04-02 19:19:35 UTC (rev 1234)
@@ -1290,6 +1290,13 @@
     $CHGLINE=shift;
     my $newentry=shift;
 
+    # Work around the fact that write() with formats
+    # seems to assume that character == byte
+    # See http://rt.perl.org/rt3/Public/Bug/Display.html?id=33832
+    # and Debian bug #473769
+    my $count = () = $CHGLINE =~ /[\x80-\xFF]/mg;
+    $CHGLINE .= " " x $count;
+
     print O "\n" if $opt_news && ! ($newentry || $linecount);
     $linecount++;
     my $f=select(O);



-- 
To unsubscribe, send mail to [EMAIL PROTECTED]

Reply via email to