[SCM] Git repository for devscripts branch, master, updated. v2.11.9-9-g82e52b1

James McCoy jamessan at debian.org
Sat Jun 30 14:22:06 UTC 2012


The following commit has been merged in the master branch:
commit 82e52b1e5500ccd41bf48550abb91aac29232000
Author: James McCoy <jamessan at debian.org>
Date:   Sat Jun 30 10:21:41 2012 -0400

    rc-alert: Handle rc bugs assigned to source packages.
    
    Closes: #576853
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 6b1fa13..88d1212 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ devscripts (2.11.10) UNRELEASED; urgency=low
   * dscverify: Use GetOptions to handle argument parsing.  (Closes: #679148)
   * uscan: Properly use the File::Temp interface so files aren't being created
     with the stringified version of a file glob.  (Closes: #678193)
-  * rc-alert: Unset wget's continue option to ensure the bug list is properly
-    downloaded.  (Closes: #677229)
+  * rc-alert:
+    + Unset wget's continue option to ensure the bug list is properly
+      downloaded.  (Closes: #677229)
+    + Handle rc bugs assigned to source packages.  (Closes: #576853)
   * Devscripts/Packages.pm, Devscripts/PackageDeps.pm: Parse dpkg's status
     file using Dpkg::Control.
 
diff --git a/scripts/rc-alert.pl b/scripts/rc-alert.pl
index d6d0bf4..571ce1e 100755
--- a/scripts/rc-alert.pl
+++ b/scripts/rc-alert.pl
@@ -190,7 +190,7 @@ if (@ARGV) {
     $package_list = \%tmp;
 }
 else {
-    $package_list = InstalledPackages(0);
+    $package_list = InstalledPackages(1);
 }
 
 ## Get popcon information
@@ -278,7 +278,11 @@ sub remove_duplicate_values($) {
 sub store_if_relevant(%) {
     my %args = @_;
 
-    if (exists($$package_list{$args{pkg}})) {
+    my $pkgname = $args{pkg};
+    $args{pkg} =~ s/^src://;
+
+    if (exists($package_list->{$args{pkg}})
+        || exists($package_list->{$pkgname})) {
 	# potentially relevant
 	my ($flags, $flagsapply) = human_flags($args{tags});
 	my $distsapply = 1;
@@ -294,7 +298,7 @@ sub store_if_relevant(%) {
 	}
 
 	# yep, relevant
-	my $bug_string = "Package: $args{pkg}\n" .
+	my $bug_string = "Package: $pkgname\n" .
 	    $comment .  # non-empty comments always contain the trailing \n
 	    "Bug:     $args{num}\n" .
 	    "Title:   " . unhtmlsanit($args{name}) . "\n" .

-- 
Git repository for devscripts



More information about the devscripts-devel mailing list