[csw-devel] SF.net SVN: gar:[20325] csw/mgar/gar/v2

[wahwah at users.sourceforge.net]

Revision: 20325
          http://gar.svn.sourceforge.net/gar/?rev=20325&view=rev
Author:   wahwah
Date:     2013-02-21 09:19:51 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
checkpkg: use --catalog-architecture

as per:
http://lists.opencsw.org/pipermail/maintainers/2013-February/017727.html

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.pkg.mk
    csw/mgar/gar/v2/lib/python/checkpkg2.py
    csw/mgar/gar/v2/lib/python/csw_upload_pkg.py

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2013-02-21 09:19:36 UTC (rev 20324)
+++ csw/mgar/gar/v2/gar.pkg.mk	2013-02-21 09:19:51 UTC (rev 20325)
@@ -1014,7 +1014,7 @@
 #
 pkgcheck: $(foreach SPEC,$(_PKG_SPECS),package-$(SPEC))
 	$(_DBG)( LC_ALL=C $(GARBIN)/checkpkg \
-		--architecture "$(GARCH)" \
+		--catalog-architecture "$(GARCH)" \
 		--os-releases "$(SPKG_OSNAME)" \
 		--catalog-release "$(CATALOG_RELEASE)" \
 		$(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage --tmpdir $(SPKG_TMPDIR) -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;)

Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg2.py	2013-02-21 09:19:36 UTC (rev 20324)
+++ csw/mgar/gar/v2/lib/python/checkpkg2.py	2013-02-21 09:19:51 UTC (rev 20325)
@@ -71,7 +71,7 @@
       dest="osrel_commas",
       help=("Comma separated list of ['SunOS5.9', 'SunOS5.10'], "
             "e.g. 'SunOS5.9,SunOS5.10'."))
-  parser.add_option("-a", "--architecture",
+  parser.add_option("-a", "--catalog-architecture",
       dest="arch",
       help="Architecture: i386, sparc.")
   parser.add_option("--profile", dest="profile",
@@ -97,10 +97,10 @@
   if not options.osrel_commas:
     err_msg_list.append("Please specify --os-releases.")
   if not options.arch:
-    err_msg_list.append("Please specify --architecture.")
+    err_msg_list.append("Please specify --catalog-architecture.")
   if options.arch not in cc.PHYSICAL_ARCHITECTURES:
     err_msg_list.append(
-        "Valid --architecture values are: %s, you passed: %r"
+        "Valid --catalog-architecture values are: %s, you passed: %r"
         % (cc.PHYSICAL_ARCHITECTURES, options.arch))
   if err_msg_list:
     raise UsageError(" ".join(err_msg_list))

Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2013-02-21 09:19:36 UTC (rev 20324)
+++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2013-02-21 09:19:51 UTC (rev 20325)
@@ -428,7 +428,7 @@
           checkpkg_executable,
           "--catalog-release", self.catrel,
           "--os-release", osrel,
-          "--architecture", arch,
+          "--catalog-architecture", arch,
       ] + md5_sums
       ret = subprocess.call(args_by_cat[(arch, osrel)] + ["--quiet"])
       if ret:

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