Attachment 305340 Details for Bug 444778 – Have tested, Pls review.

[patch] Have tested, Pls review.

rhr2.patch (text/plain), 4.72 KB, created by XINSUN on 2008-05-14 09:13:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: XINSUN

Created: 2008-05-14 09:13:48 UTC

Size: 4.72 KB

patch

obsolete

>Index: post.cgi
>===================================================================
>RCS file: /cvs/qa/hwcert/post.cgi,v
>retrieving revision 1.54
>diff -u -r1.54 post.cgi
>--- post.cgi	14 May 2008 06:01:26 -0000	1.54
>+++ post.cgi	14 May 2008 09:06:56 -0000
>@@ -155,6 +155,20 @@
>         # Move file to final resting place
>         $rpmlocation = CreateRpm($md5sum, $filename, $data);
> 
>+        # Judge the rpm result package's type.
>+        my @cmdargs = qq(/bin/rpm -qp $rpmlocation --qf "%{PROVIDES}");
>+        my $rpm_type = `@cmdargs`;
>+
>+        if ($rpm_type !~ /hts/) {
>+	    UnlinkPath($rpmlocation);        
>+            if ($rpm_type =~ /rhr2/) {
>+                  #Stop accepting rhr2 result packages. 
>+                  ThrowUserError("obsolete_rhr2_package");
>+            } else {
>+                  ThrowUserError("hts_package_required");                                               
>+            }
>+        }
>+
>         # Check to make sure log files do not exceed maximum size limit
>         my $result = CheckMaxFileSize($rpmlocation);
>         if ($result) {
>Index: hwcert.pl
>===================================================================
>RCS file: /cvs/qa/hwcert/hwcert.pl,v
>retrieving revision 1.50
>diff -u -r1.50 hwcert.pl
>--- hwcert.pl	14 May 2008 05:45:08 -0000	1.50
>+++ hwcert.pl	14 May 2008 09:06:57 -0000
>@@ -1020,14 +1016,23 @@
>        return;
>   }
> 
>+  my $comment; 
>+
>   # Just attach the file if it's not a results package.
>-  if (RpmProvides($rpmlocation) !~ /hts|rhr2/ ){
>+  my $rpm_type = RpmProvides($rpmlocation);
>+  if ($rpm_type !~ /hts/) {
>        UnlinkPath($rpmlocation);
>-       return;
>+       if ($rpm_type =~ /rhr2/) {
>+           #Stop accepting RHR2 test result package: 
>+           #Add the notification into the comments,return comments and won't parse the result packages.
>+           $comment = "\nRHR2 has been replaced by HTS! The Hardware Certification Catalog will no longer accept RHR2 test result package.";
>+           return $comment;
>+       } else {
>+           #The attachment is not either HTS or RHR2 result package, return directly.
>+           return;
>+       }
>   }
> 
>-  my $comment; 
>-
>   # Verify we haven't already seen this package
>   SendSQL2("SELECT filename FROM cert_rpms WHERE md5sum = " . SqlQuote($md5sum));
>   FetchOneColumn2() && ThrowUserError("duplicate_attachment");
>Index: attach.cgi
>===================================================================
>RCS file: /cvs/qa/hwcert/attach.cgi,v
>retrieving revision 1.31
>diff -u -r1.31 attach.cgi
>--- attach.cgi	14 May 2008 06:05:30 -0000	1.31
>+++ attach.cgi	14 May 2008 09:06:57 -0000
>@@ -114,6 +114,20 @@
> 
>         # Move file to final resting place
>         $rpmlocation = CreateRpm($md5sum, $filename, $data);
>+         
>+        # Judge the rpm result package's type.
>+        my @cmdargs = qq(/bin/rpm -qp $rpmlocation --qf "%{PROVIDES}");
>+        my $rpm_type = `@cmdargs`;
>+
>+        if ($rpm_type !~ /hts/) {
>+	    UnlinkPath($rpmlocation);        
>+            if ($rpm_type =~ /rhr2/) {
>+                  #Stop accepting rhr2 result packages. 
>+                  ThrowUserError("obsolete_rhr2_package");
>+            } else {
>+                  ThrowUserError("hts_package_required");                                               
>+            }
>+        }
> 
>         # Check to make sure log files do not exceed maximum size limit
>         my $result = CheckMaxFileSize($rpmlocation);
>Index: template/en/default/global/user-error.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/global/user-error.html.tmpl,v
>retrieving revision 1.13
>diff -u -r1.13 user-error.html.tmpl
>--- template/en/default/global/user-error.html.tmpl	29 Feb 2008 12:17:12 -0000	1.13
>+++ template/en/default/global/user-error.html.tmpl	14 May 2008 09:06:57 -0000
>@@ -445,6 +445,10 @@
>     Sorry, you aren't a member of the 'editkeywords' group, and so
>     you aren't allowed to add, modify or delete keywords.
> 
>+  [% ELSIF error == "hts_package_required" %]
>+    [% title = "HTS Package Required" %]
>+    You must upload the HTS test result package as the Certification Package.
>+
>   [% ELSIF error == "hwcert_group_access_denied" %]
>     [% title = "Access Denied" %]
>     Only member of hwcert_edit group can do "[% action FILTER html %]".
>@@ -647,6 +651,11 @@
>     Either no products have been defined to enter [% terms.bugs %] against or you have not
>     been given access to any.
> 
>+  [% ELSIF error == "obsolete_rhr2_package" %]
>+    [% title = "Obsolete RHR2 Package" %]
>+    RHR2 has been replaced by HTS! 
>+    RHR2 test result package will no longer be accepted by catalog!
>+
>   [% ELSIF error == "old_password_incorrect" %]
>     [% title = "Incorrect Old Password" %]
>     You did not enter your old password correctly.

Actions: View | Diff

Attachments on bug 444778: 305340 | 305742 | 307030 | 307171 | 310015