[Dehs-devel] SVN devscripts commit: r235 - in trunk: . debian

[Julian Gilbey]

Author: jdg
Date: 2005-08-30 18:03:28 +0000 (Tue, 30 Aug 2005)
New Revision: 235

Modified:
   trunk/debian/changelog
   trunk/uscan.pl
Log:
Fix dehs_start/end_output code

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-08-28 15:13:04 UTC (rev 234)
+++ trunk/debian/changelog	2005-08-30 18:03:28 UTC (rev 235)
@@ -2,7 +2,7 @@
 
   [ Julian Gilbey ]
   * bts: tags: revert change in 2.9: reinstate "fixed-in-experimental" (it
-    still appears to be in use) and don't need "help" twice
+    still appears to be in use) and don't need "help" twice (Closes: #325480)
   * checkbashisms: correctly detect "function" keyword (Closes: #324599)
   * uscan: report on package being scanned when --report is used (Closes:
     #324102)

Modified: trunk/uscan.pl
===================================================================
--- trunk/uscan.pl	2005-08-28 15:13:04 UTC (rev 234)
+++ trunk/uscan.pl	2005-08-30 18:03:28 UTC (rev 235)
@@ -1277,7 +1277,7 @@
     my $msg = $_[0];
     $msg =~ s/\s*$//;
     %dehs_tags = ('errors' => "$msg");
-    our $dehs_end_output=1;
+    $dehs_end_output=1;
     dehs_output;
     exit 1;
 }
@@ -1285,11 +1285,10 @@
 sub dehs_output ()
 {
     return unless $dehs;
-    our $dehs_start_output;
 
-	if (! $dehs_start_output) {
-		print "<dehs>\n";
-	    $dehs_start_output=1;
+    if (! $dehs_start_output) {
+	print "<dehs>\n";
+	$dehs_start_output=1;
     }
 
     for my $tag (qw(package debian-uversion debian-mangled-uversion