From Fedora 21 Alpha TC6 on, the version defined in the
buildstamp and treeinfo files (which are supplied by release engineering) use _ not - to split release version, milestone and compose (e.g.21_Alpha_TC6, not 20-Alpha-TC6 as it was previously). --- pyanaconda/packaging/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 18d6297..7c7d6e4 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -391,7 +391,7 @@ class Payload(object):
def _getReleaseVersion(self, url): """ Return the release version of the tree at the specified URL. """ - version = productVersion.split("-")[0] + version = productVersion.split("_")[0]
log.debug("getting release version from tree at %s (%s)", url, version)
@@ -405,7 +405,7 @@ class Payload(object): c.read(treeinfo) try: # Trim off any -Alpha or -Beta - version = c.get("general", "version").split("-")[0] + version = c.get("general", "version").split("_")[0] except ConfigParser.Error: pass
On Wed, 2014-09-10 at 15:48 -0700, Adam Williamson wrote:
From Fedora 21 Alpha TC6 on, the version defined in the buildstamp and treeinfo files (which are supplied by release engineering) use _ not - to split release version, milestone and compose (e.g.21_Alpha_TC6, not 20-Alpha-TC6 as it was previously).
pyanaconda/packaging/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 18d6297..7c7d6e4 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -391,7 +391,7 @@ class Payload(object):
def _getReleaseVersion(self, url): """ Return the release version of the tree at the specified URL. """
version = productVersion.split("-")[0]
version = productVersion.split("_")[0] log.debug("getting release version from tree at %s (%s)", url, version)
@@ -405,7 +405,7 @@ class Payload(object): c.read(treeinfo) try: # Trim off any -Alpha or -Beta
version = c.get("general", "version").split("-")[0]
version = c.get("general", "version").split("_")[0] except ConfigParser.Error: pass
Looks good to me.
On 09/10/2014 06:48 PM, Adam Williamson wrote:
From Fedora 21 Alpha TC6 on, the version defined in the buildstamp and treeinfo files (which are supplied by release engineering) use _ not - to split release version, milestone and compose (e.g.21_Alpha_TC6, not 20-Alpha-TC6 as it was previously).
pyanaconda/packaging/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 18d6297..7c7d6e4 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -391,7 +391,7 @@ class Payload(object):
def _getReleaseVersion(self, url): """ Return the release version of the tree at the specified URL. """
version = productVersion.split("-")[0]
version = productVersion.split("_")[0] log.debug("getting release version from tree at %s (%s)", url, version)
@@ -405,7 +405,7 @@ class Payload(object): c.read(treeinfo) try: # Trim off any -Alpha or -Beta
version = c.get("general", "version").split("-")[0]
version = c.get("general", "version").split("_")[0] except ConfigParser.Error: pass
Not to make this patch take longer than it needs to, but maybe we should just take the digit part of the version and throw out the rest? Then releng can change the divider to whatever they please and we don't have to care until they change it to something *really* stupid.
Something like, version = re.match('([\d.]+)', productVersion).group(1)
On Thu, Sep 11, 2014 at 09:30:18AM -0400, David Shea wrote:
On 09/10/2014 06:48 PM, Adam Williamson wrote:
From Fedora 21 Alpha TC6 on, the version defined in the buildstamp and treeinfo files (which are supplied by release engineering) use _ not - to split release version, milestone and compose (e.g.21_Alpha_TC6, not 20-Alpha-TC6 as it was previously).
pyanaconda/packaging/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 18d6297..7c7d6e4 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -391,7 +391,7 @@ class Payload(object): def _getReleaseVersion(self, url): """ Return the release version of the tree at the specified URL. """
version = productVersion.split("-")[0]
version = productVersion.split("_")[0] log.debug("getting release version from tree at %s (%s)", url, version)
@@ -405,7 +405,7 @@ class Payload(object): c.read(treeinfo) try: # Trim off any -Alpha or -Beta
version = c.get("general", "version").split("-")[0]
version = c.get("general", "version").split("_")[0] except ConfigParser.Error: pass
Not to make this patch take longer than it needs to, but maybe we should just take the digit part of the version and throw out the rest? Then releng can change the divider to whatever they please and we don't have to care until they change it to something *really* stupid.
Something like, version = re.match('([\d.]+)', productVersion).group(1)
RHEL uses X.Y for versions.
On 09/11/2014 10:32 AM, Brian C. Lane wrote:
On Thu, Sep 11, 2014 at 09:30:18AM -0400, David Shea wrote:
On 09/10/2014 06:48 PM, Adam Williamson wrote:
From Fedora 21 Alpha TC6 on, the version defined in the buildstamp and treeinfo files (which are supplied by release engineering) use _ not - to split release version, milestone and compose (e.g.21_Alpha_TC6, not 20-Alpha-TC6 as it was previously).
pyanaconda/packaging/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 18d6297..7c7d6e4 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -391,7 +391,7 @@ class Payload(object): def _getReleaseVersion(self, url): """ Return the release version of the tree at the specified URL. """
version = productVersion.split("-")[0]
version = productVersion.split("_")[0] log.debug("getting release version from tree at %s (%s)", url, version)
@@ -405,7 +405,7 @@ class Payload(object): c.read(treeinfo) try: # Trim off any -Alpha or -Beta
version = c.get("general", "version").split("-")[0]
version = c.get("general", "version").split("_")[0] except ConfigParser.Error: pass
Not to make this patch take longer than it needs to, but maybe we should just take the digit part of the version and throw out the rest? Then releng can change the divider to whatever they please and we don't have to care until they change it to something *really* stupid.
Something like, version = re.match('([\d.]+)', productVersion).group(1)
RHEL uses X.Y for versions.
Which is why I included a dot in the regex ;-)
On Thu, 2014-09-11 at 12:07 -0400, David Shea wrote:
On 09/11/2014 10:32 AM, Brian C. Lane wrote:
On Thu, Sep 11, 2014 at 09:30:18AM -0400, David Shea wrote:
On 09/10/2014 06:48 PM, Adam Williamson wrote:
From Fedora 21 Alpha TC6 on, the version defined in the buildstamp and treeinfo files (which are supplied by release engineering) use _ not - to split release version, milestone and compose (e.g.21_Alpha_TC6, not 20-Alpha-TC6 as it was previously).
pyanaconda/packaging/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index 18d6297..7c7d6e4 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -391,7 +391,7 @@ class Payload(object): def _getReleaseVersion(self, url): """ Return the release version of the tree at the specified URL. """
version = productVersion.split("-")[0]
version = productVersion.split("_")[0] log.debug("getting release version from tree at %s (%s)", url, version)
@@ -405,7 +405,7 @@ class Payload(object): c.read(treeinfo) try: # Trim off any -Alpha or -Beta
version = c.get("general", "version").split("-")[0]
version = c.get("general", "version").split("_")[0] except ConfigParser.Error: pass
Not to make this patch take longer than it needs to, but maybe we should just take the digit part of the version and throw out the rest? Then releng can change the divider to whatever they please and we don't have to care until they change it to something *really* stupid.
Something like, version = re.match('([\d.]+)', productVersion).group(1)
RHEL uses X.Y for versions.
Which is why I included a dot in the regex ;-)
That's fine by me (I'm assuming your regex works, I suck at regex) but whatever we do, can we do it now?
actually could I suggest we take my _ version for now as it's a smaller change, do a new anaconda build with that which we can use for TC7, then review davidshea's version at leisure? but if people would rather take david's immediately I'm fine, I just want to make sure we get a fixed build today because we really need a TC7 with the correct bits for netinst to work.
On Thu, 2014-09-11 at 10:13 -0700, Adam Williamson wrote:
Not to make this patch take longer than it needs to, but maybe we should just take the digit part of the version and throw out the rest? Then releng can change the divider to whatever they please and we don't have to care until they change it to something *really* stupid.
Something like, version = re.match('([\d.]+)', productVersion).group(1)
RHEL uses X.Y for versions.
Which is why I included a dot in the regex ;-)
That's fine by me (I'm assuming your regex works, I suck at regex) but whatever we do, can we do it now?
For the record (in case anyone comes looking through archives and wonders what happened to this patch): this was addressed with a regex as suggested by David, ultimately implemented by bcl, as commit b900a9e9325e1fb31198ac2d1cc5417c7e922e99 (on master) "Use only the digits from productVersion".
anaconda-patches@lists.fedorahosted.org