[Fedora-security-commits] fedora-security/tools/lib/Libexig Fedora.pm, 1.11, 1.12

[fedora-security-commits at redhat.com]

Author: vdanen

Update of /cvs/fedora/fedora-security/tools/lib/Libexig
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8066/lib/Libexig

Modified Files:
	Fedora.pm 
Log Message:
fully handle the 'all' version type now


Index: Fedora.pm
===================================================================
RCS file: /cvs/fedora/fedora-security/tools/lib/Libexig/Fedora.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Fedora.pm	22 Oct 2009 16:37:18 -0000	1.11
+++ Fedora.pm	3 Nov 2009 18:29:25 -0000	1.12
@@ -196,23 +196,14 @@
 		$bug{'short_desc'} .= " [Fedora $versions{$version}]";
 		$bug{'version'} = $versions{$version};
 
-        if ($bug{'version'} eq 'all') {
-            my $allcomps = 1;
-        } else {
-            my $allcomps = 0;
-        }
-
 		$bug{'comment'} =
 			$comment_head.
 			$comment_parents.
 			($bug{'version'} eq 'rawhide' ? $comment_rawhide : $comment_update).
             ($bug{'version'} eq 'all' ? $comment_all : print '' ).
 			$comment_tail;
-        if ($bug{'version'} eq 'all') {
-            $bug{'version'} = 'rawhide';
-        }
 
-		push @retval, \%bug;
+        push @retval, \%bug;
 	}
 
 	return \@retval;
@@ -235,11 +226,22 @@
 
 	my @created_bugs;
 	my @created_versions;
+
+    my $allcomps;
 	
 	my $comment = "Created Fedora tracking bugs for $component:\n\n";
 
 	foreach my $bug (@{$tracking_bugs}) {
 		use Data::Dumper;
+
+        if ($bug->{'version'} eq 'all')
+        {
+			$allcomps = 1;
+            $bug->{'version'} = 'rawhide';
+        } else {
+			$allcomps = 0;
+        }
+
 		my $bug_id = $bugzilla->file_bug ($bug);
 
 		if (!defined($bug_id)) {
@@ -263,30 +265,33 @@
 
 			$bugzilla->add_comment ($bug_id, $tr_comment);
 
-			push @created_versions, $bug->{'version'};
+            push @created_versions, $bug->{'version'};
 		}
 		else {
-#			# XXX temporary until F9 BZ component is created XXX
-#			my $tr_comment = 
-#				'You can eventually use the following link to '.
-#				'create the update request for upcoming Fedora 9: '."\n".
-#				'https://admin.fedoraproject.org/updates/new/'.
-#				'?request=Stable'.
-#				'&type=security'.
-#				'&release=Fedora%209'.
-#				'&bugs='.$bug_id;
-#
-#			foreach my $bug (@{$parent_bugs}) {
-#				$tr_comment .= ','.$bug;
-#			}
-#
-#			$bugzilla->add_comment ($bug_id, $tr_comment);
+#			# This is for an "all" versioned issue so we can have our link
+			if ($allcomps == 1)
+            {
+			my $tr_comment = 
+                'This issue affects more than one Fedora version.'."\n".
+				'You can eventually use the following link to '.
+				'create the update request for each affected version: '."\n".
+				'https://admin.fedoraproject.org/updates/new/'.
+				'?request=Stable'.
+				'&type_=security'.
+				'&bugs='.$bug_id;
+
+			foreach my $bug (@{$parent_bugs}) {
+				$tr_comment .= ','.$bug;
+			}
+
+			$bugzilla->add_comment ($bug_id, $tr_comment);
+        }
 
 			push @created_versions, $rawhide_version;
 		}
 
 		$bugzilla->add_blockers ($bug_id, $parent_bugs);
-        if (my $allcomps eq 0)
+        if ($allcomps == 0)
         {
 		    $comment .= $bug->{'version'}.": bug #$bug_id\n";
         } else {