[meego-commits] 24376: Changes to MeeGo:1.2.0:oss:Update:Testing/ca-certificates

[lionel]

Hi,
I have made the following changes to ca-certificates in project MeeGo:1.2.0:oss:Update:Testing. Please review and accept ASAP.

Thank You,
lionel

[This message was auto-generated]

---

Request #24376:

  submit:   home:lionel:branches:MeeGo:1.2.0:oss:Update:Testing/ca-certificates(r10)(cleanup) -> MeeGo:1.2.0:oss:Update:Testing/ca-certificates


Message:
    * Tue Oct 25 2011 Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com> - 2011
- Fix perl script generate certs file

State:   new          2011-10-25T10:35:46 lionel
Comment: None



changes files:
--------------
--- ca-certificates.changes
+++ ca-certificates.changes
@@ -0,0 +1,3 @@
+* Tue Oct 25 2011 Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com> - 2011
+- Fix perl script generate certs file
+

spec files:
-----------

other changes:
--------------

++++++ generate-cacerts.pl
--- generate-cacerts.pl
+++ generate-cacerts.pl
@@ -297,7 +297,14 @@
         if ($write_current_cert == 1)
         {
             $pem_file_count++;
-            open(PEM, ">$cert_alias.pem");
+            $filename = $cert_alias . ".pem";
+            $i = 0;
+            while ( -e $filename) {
+                $i++;
+                $filename = $cert_alias . "-$i.pem";
+            }
+            open(PEM, ">$filename");
+            print "Opening $filename -> $pem_file_count\n";
             print PEM $cert;
         }
     }
@@ -307,6 +314,7 @@
         if ($write_current_cert == 1)
         {
             print PEM $cert;
+            print "Closing $cert_alias.pem -> $pem_file_count\n";
             close(PEM);
         }
         $write_current_cert = 1
@@ -326,7 +334,7 @@
 {
     print "$pem_file_count";
     die "Number of .pem files produced does not match".
-        " number of certs read from $file.";
+        " number of certs read from $file (" . scalar(@pem_files) . " / $pem_file_count).";
 }
 
 # Now store each cert in the 'cacerts' file using keytool.
@@ -344,5 +352,5 @@
 if ($certs_written_count != $pem_file_count)
 {
     die "Number of certs added to keystore does not match".
-        " number of certs read from $file.";
+        " number of certs read from $file : ($certs_written_count / $pem_file_count).";
 }