cvs: pearweb /public_html release-upload.php

cellog          Wed Oct 18 19:46:06 2006 UTC

  Modified files:              
    /pearweb/public_html        release-upload.php 
  Log:
  fix Bug #9018: Release upload validation not check the package.xml
  
http://cvs.php.net/viewvc.cgi/pearweb/public_html/release-upload.php?r1=1.73&r2=1.74&diff_format=u
Index: pearweb/public_html/release-upload.php
diff -u pearweb/public_html/release-upload.php:1.73 
pearweb/public_html/release-upload.php:1.74
--- pearweb/public_html/release-upload.php:1.73 Tue May  2 04:23:48 2006
+++ pearweb/public_html/release-upload.php      Wed Oct 18 19:46:06 2006
@@ -15,7 +15,7 @@
    +----------------------------------------------------------------------+
    | Authors:                                                             |
    +----------------------------------------------------------------------+
-   $Id: release-upload.php,v 1.73 2006/05/02 04:23:48 cellog Exp $
+   $Id: release-upload.php,v 1.74 2006/10/18 19:46:06 cellog Exp $
 */
 
 auth_require('pear.dev');
@@ -273,6 +273,13 @@
         if (substr($verinfo[2], 1, 2) == 'rc') {
             $errors[] = 'Release Candidate versions MUST use upper-case RC 
versioning, not rc';
         }
+        $filelist = $info->getFilelist();
+        if (isset($filelist['package.xml'])) {
+            $warnings[] = 'package.xml should not be present in package.xml, 
installation may fail';
+        }
+        if (isset($filelist['package2.xml'])) {
+            $warnings[] = 'package2.xml should not be present in package.xml, 
installation may fail';
+        }
     }
     if ($info->getChannel() != PEAR_CHANNELNAME) {
         $errors[] = 'Only channel ' . PEAR_CHANNELNAME .

-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php