Attachment 317544 Details for Bug 458491 – Patch Improve:

[patch] Patch Improve:

package_flag.patch (text/plain), 4.62 KB, created by XINSUN on 2008-09-24 01:27:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: XINSUN

Created: 2008-09-24 01:27:44 UTC

Size: 4.62 KB

patch

obsolete

>Index: attachment.cgi
>===================================================================
>RCS file: /cvs/qa/hwcert/attachment.cgi,v
>retrieving revision 1.18
>diff -u -r1.18 attachment.cgi
>--- attachment.cgi	18 Aug 2008 07:32:56 -0000	1.18
>+++ attachment.cgi	24 Sep 2008 00:58:18 -0000
>@@ -148,6 +148,8 @@
>   validateContentType() unless $::FORM{'ispatch'};
>   validateObsolete() if $::FORM{'obsolete'};
>   validateMd5sumOverride() if $::FORM{'md5sumOverride'};
>+  Bugzilla::Flag::validate($cgi, $::FORM{'bugid'});
>+  Bugzilla::FlagType::validate($cgi, $::FORM{'bugid'});
>   insert($data);
> }
> elsif ($action eq "edit") 
>@@ -1022,6 +1024,13 @@
>      $comment.= processResultsRpm($::FORM{'bugid'}, $filename, $md5sum, $attachid, $attachasresult, $data );
>   }
> 
>+  SendSQL("select NOW()");
>+  my $timestamp = FetchOneColumn();
>+
>+  # Update flags.
>+  my $target = Bugzilla::Flag::GetTarget($::FORM{'bugid'});
>+  Bugzilla::Flag::process($target, $timestamp, \%::FORM); 
>+
>   use Text::Wrap;
>   $Text::Wrap::columns = 80;
>   $Text::Wrap::huge = 'overflow';
>@@ -1049,9 +1058,6 @@
>   my $owner = "";
>   
>   if ($::FORM{'takebug'} && UserInGroup("editbugs")) {
>-      SendSQL("select NOW()");
>-      my $timestamp = FetchOneColumn();
>-      
>       my @fields = ("assigned_to", "bug_status", "resolution", "login_name");
>       
>       # Get the old values, for the bugs_activity table
>Index: hwcert.pl
>===================================================================
>RCS file: /cvs/qa/hwcert/hwcert.pl,v
>retrieving revision 1.58
>diff -u -r1.58 hwcert.pl
>--- hwcert.pl	3 Sep 2008 05:11:04 -0000	1.58
>+++ hwcert.pl	24 Sep 2008 00:58:18 -0000
>@@ -1167,6 +1167,25 @@
>     }
>     $comment .= "\n";
>   }
>+  
>+  my $flag_types = $bug->{'flag_types'};
>+  my $package_flag_id = "0";
>+  my $package_flagtype_id = "0";
>+  my $package_flag_status = "";
>+  foreach my $type (@{$flag_types}) {
>+      if ($type->{'name'} eq "hwcert_work_package_review") {
>+          $package_flagtype_id = $type->{'id'};
>+          foreach my $flag (@{$type->{'flags'}}) {
>+              $package_flag_id = $flag->{'id'};
>+              $package_flag_status = $flag->{'status'};
>+          }
>+      }
>+  }
>+
>+  if ($package_flag_status ne "+") {
>+      my $form_flagtype_id = "flag_type-" . $package_flagtype_id;
>+      $::FORM{"$form_flagtype_id"} = "+";
>+  }
> 
>   # Clean up after ourselves
>   UnlinkPath($scratchlocation);
>Index: post.cgi
>===================================================================
>RCS file: /cvs/qa/hwcert/post.cgi,v
>retrieving revision 1.64
>diff -u -r1.64 post.cgi
>--- post.cgi	18 Sep 2008 20:15:03 -0000	1.64
>+++ post.cgi	24 Sep 2008 00:58:18 -0000
>@@ -860,6 +860,10 @@
>         }
>         $comment .= "\n";
>     }
>+
>+    my $package_flag_type_id = FlagTypeNameToId("hwcert_work_package_review");
>+    SendSQL("INSERT INTO flags (type_id, status, bug_id, creation_date, modification_date, setter_id) VALUES ($package_flag_type_id, '+', $id, NOW(), NOW(), $::userid)"); 
>+
> };
> 
> if ($cgi->param('comment')){
>Index: process.cgi
>===================================================================
>RCS file: /cvs/qa/hwcert/process.cgi,v
>retrieving revision 1.37
>diff -u -r1.37 process.cgi
>--- process.cgi	3 Sep 2008 05:07:42 -0000	1.37
>+++ process.cgi	24 Sep 2008 00:58:18 -0000
>@@ -2220,6 +2214,39 @@
> 	}else { CheckRPM("",$cid,$whoid); }
>     }
> 
>+    my $need_package_review = 0; 
>+    SendSQL2("SELECT id FROM cert_rpms WHERE (checked IS NULL OR checked = 0) AND attach_id !=0 AND cert_id = $cid");
>+    if (MoreSQLData2()) { 
>+        $need_package_review = MoreSQLData2();
>+        FetchOneColumn2(); 
>+    }
>+  
>+    my $flag_types = $bug->{'flag_types'};
>+    my $package_flag_id = "0";
>+    my $package_flagtype_id = "0";
>+    my $package_flag_status = "";
>+    foreach my $type (@{$flag_types}) {
>+        if ($type->{'name'} eq "hwcert_work_package_review") {
>+            $package_flagtype_id = $type->{'id'};
>+            foreach my $flag (@{$type->{'flags'}}) {
>+                $package_flag_id = $flag->{'id'};
>+                $package_flag_status = $flag->{'status'};
>+            }
>+        }
>+    }
>+
>+    if ($need_package_review) {
>+        if ($package_flag_status ne "+") {
>+            my $form_flagtype_id = "flag_type-" . $package_flagtype_id;
>+            $::FORM{"$form_flagtype_id"} = "+";
>+        }
>+    } else {
>+        if ($package_flag_status eq "+") {
>+            my $form_package_flag_id = "flag-" . $package_flag_id;
>+            $::FORM{"$form_package_flag_id"} = "X";
>+        }   
>+    }
>+
>     #Add or modify the testplan
>     if ( ( $cgi->param('testplanstatus') || $cgi->param('testplanarea') ) && $bug_status ne 'CLOSED' && $cid ) {
>         my ( $data_desc, $data_flag, $flag, $area );

Actions: View | Diff

Attachments on bug 458491: 317544