Hi Severin,
The previous URL structures will still work as expected. All this patch does is make it so that the url of your updates will appear as the /FEDORA-2011-0001 structure, but all previous structures are still supported, such as:
/Package.updateid /Package.name /PackageUpdate.title /PackageBuild.nvr /Release.name /Release.name/PackageUpdate.updateid /Release.name/PackageUpdate.status /Release.name/PackageUpdate.status/PackageUpdate.title
And yes, the updateid should be returned via the JSON response, as I know AutoQA relies on it.
luke
----- Original Message ----- From: "Severin Gehwolf" sgehwolf@redhat.com To: "A mailing list for the Bodhi project" bodhi@lists.fedorahosted.org Sent: Wednesday, August 31, 2011 1:33:49 PM Subject: Re: [bodhi] 2 commits - bodhi/model.py
Hi Luke,
Does commit 48732b8ba9cfdf8e2ceb0363756b399ceffad7ae mean that old update URLs of the form:
http://bodhi.example.com/updates/ed-1.5-3.fc15
won't work soon? Does bodhi return the update ID in the JSON response when pushing an update?
Thanks, Severin
On Wed, 2011-08-31 at 16:58 +0000, Luke Macken wrote:
bodhi/model.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
New commits: commit 48732b8ba9cfdf8e2ceb0363756b399ceffad7ae Author: Luke Macken lmacken@redhat.com Date: Wed Aug 31 12:57:35 2011 -0400
Switch to preferring update IDs as URLs as opposed to a list of builds. This will mitigate issues when an update is edited and builds are added/removed, and thus previous URLs are invalid.
diff --git a/bodhi/model.py b/bodhi/model.py index 5185cc7..1535630 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -661,12 +661,11 @@ class PackageUpdate(SQLObject): def get_url(self): """ Return the relative URL to this update """ path = ['/']
# Until our update ids are reliable...
#if self.updateid:
# path.append(self.release.name)
# path.append(self.updateid)
#else:
path.append(self.title)
if self.updateid:
#path.append(self.release.name)
path.append(self.updateid)
else:
path.append(self.title) return join(*path)
def __str__(self):
commit 83ee9296999c8ad14d6604d5f27736319a126da9 Author: Luke Macken lmacken@redhat.com Date: Thu Aug 25 09:36:30 2011 -0400
Apply a patch from Scop to reduce unnecessary Bugzilla mail by commenting & closing bugs at the same time.
diff --git a/bodhi/model.py b/bodhi/model.py index 2cccdf4..5185cc7 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -573,7 +573,6 @@ class PackageUpdate(SQLObject): if self.status == 'testing': map(lambda bug: bug.testing(self), self.bugs) elif self.status == 'stable':
map(lambda bug: bug.add_comment(self), self.bugs) if self.close_bugs: if self.type == 'security':
@@ -581,7 +580,7 @@ class PackageUpdate(SQLObject): for bug in self.bugs: if not bug.parent: log.debug("Closing tracker bug %d" % bug.bz_id)
bug.close_bug(self)
bug.close_bug(self, bug._default_message(self)) # Now, close our parents bugs as long as nothing else # depends on them, and they are not in a NEW state
@@ -592,6 +591,7 @@ class PackageUpdate(SQLObject): if parent.bug_status == "NEW": log.debug("Parent bug %d is still NEW; not " "closing.." % bug.bz_id)
bug.add_comment(self) continue depsclosed = True for dep in parent.dependson:
@@ -608,9 +608,14 @@ class PackageUpdate(SQLObject): break if depsclosed: log.debug("Closing parent bug %d" % bug.bz_id)
bug.close_bug(self)
bug.close_bug(self, bug._default_message(self))
else:
bug.add_comment(self) else:
map(lambda bug: bug.close_bug(self), self.bugs)
map(lambda bug: bug.close_bug(
self, bug._default_message(self)), self.bugs)
else:
map(lambda bug: bug.add_comment(self), self.bugs)
def status_comment(self): """
@@ -1429,7 +1434,7 @@ class Bugzilla(SQLObject): else: log.debug('Skipping bug modification, close_bugs == False')
- def close_bug(self, update):
def close_bug(self, update, comment=''): """Close this bugzilla with details from an update.
This method will only close Fedora or Fedora EPEL bugs, and it will
@@ -1442,7 +1447,7 @@ class Bugzilla(SQLObject): if bug.product not in config.get('bz_products', '').split(','): log.warning("Not closing %r bug" % bug.product) return
bug.close('ERRATA', fixedin=update.builds[0].nvr)
bug.close('ERRATA', fixedin=update.builds[0].nvr, comment=comment) except xmlrpclib.Fault, f: log.error("Unable to close bug #%d: %s" % (self.bz_id, str(f)))
bodhi mailing list bodhi@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/bodhi
_______________________________________________ bodhi mailing list bodhi@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/bodhi