Skip to main content

Source code Changes To

pkg-gate / src / util / publish / pkgmerge.py

From revision 2955 to 2958:

diff -r 796cde775790 -r 868e07939116 src/util/publish/pkgmerge.py
--- a/src/util/publish/pkgmerge.py	Fri Sep 27 10:19:27 2013 +1200
+++ b/src/util/publish/pkgmerge.py	Fri Sep 27 11:38:34 2013 -0700
@@ -62,8 +62,6 @@
                 # have a chance of being stringified correctly.
                 return str(self)
 
-BUILD_RELEASE  = "5.11"  # Should be an option to this program some day?
-
 catalog_dict   = {}    # hash table of catalogs by source uri
 fmri_cache     = {}
 manifest_cache = {}
@@ -882,11 +880,9 @@
                                 matcher = pkg.fmri.fmri_match
 
                         if matcher == pkg.fmri.glob_match:
-                                fmri = pkg.fmri.MatchingPkgFmri(
-                                    pat_stem, BUILD_RELEASE)
+                                fmri = pkg.fmri.MatchingPkgFmri(pat_stem)
                         else:
-                                fmri = pkg.fmri.PkgFmri(
-                                    pat_stem, BUILD_RELEASE)
+                                fmri = pkg.fmri.PkgFmri(pat_stem)
 
                         if not pat_ver:
                                 # Do nothing.
@@ -894,12 +890,10 @@
                         elif "*" in pat_ver or "?" in pat_ver or \
                             pat_ver == "latest":
                                 fmri.version = \
-                                    pkg.version.MatchingVersion(pat_ver,
-                                        BUILD_RELEASE)
+                                    pkg.version.MatchingVersion(pat_ver)
                         else:
                                 fmri.version = \
-                                    pkg.version.Version(pat_ver,
-                                        BUILD_RELEASE)
+                                    pkg.version.Version(pat_ver)
 
                         if pat_ver and \
                             getattr(fmri.version, "match_latest", None):

 
 
Close
loading
Please Confirm
Close