[csw-devel] SF.net SVN: gar:[9453] csw/mgar/gar/v2/lib/python

[wahwah at users.sourceforge.net]

Revision: 9453
          http://gar.svn.sourceforge.net/gar/?rev=9453&view=rev
Author:   wahwah
Date:     2010-03-30 07:54:59 +0000 (Tue, 30 Mar 2010)

Log Message:
-----------
mGAR v2: checkpkg, allowing https in pkginfo VENDOR.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/package_checks.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2010-03-30 02:07:03 UTC (rev 9452)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-03-30 07:54:59 UTC (rev 9453)
@@ -132,7 +132,7 @@
 
 def CheckVendorURL(pkg_data, error_mgr, logger, messenger):
   vendorurl = pkg_data["pkginfo"]["VENDOR"].split(" ")[0]
-  vendorurl_re = r"^(http|ftp)\://.+\..+$"
+  vendorurl_re = r"^(http|ftp)s?\://.+\..+$"
   if not re.match(vendorurl_re, vendorurl):
     error_mgr.ReportError("pkginfo-bad-vendorurl", vendorurl, "Solution: add VENDOR_URL to GAR Recipe") 
 

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-03-30 02:07:03 UTC (rev 9452)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-03-30 07:54:59 UTC (rev 9453)
@@ -441,5 +441,11 @@
     # URL is okay.
 
 
+class TestCheckVendorURL_Https(CheckpkgUnitTestHelper, unittest.TestCase):
+  FUNCTION_NAME = "CheckVendorURL"
+  def CheckpkgTest(self):
+    self.pkg_data["pkginfo"]["VENDOR"] = "https://www.example.com/"
+
+
 if __name__ == '__main__':
   unittest.main()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.