[Piuparts-devel] [Git][debian/piuparts][develop] Revert "Don't add results from outdated binaries to summary.json"

[David Steele]

David Steele pushed to branch develop at Debian / piuparts


Commits:
17a1e462 by David Steele at 2019-03-16T13:58:55Z
Revert "Don't add results from outdated binaries to summary.json"

This reverts commit 62a6b3c438f42480ce3a08996ed4994de1561591.

The patch was added to avoid incorporating summary.json reporting
results for binary packages which are no longer part of the source
package. It stopped Piuparts from blocking the source package from
testing migration in this case.

It has a bug related to "upgrade test" sections, which cause
a large number of packages to incorrectly be reported in the "waiting"
state.

Revert, and rely on ftp-masters to decruft.

https://alioth-lists.debian.net/pipermail/piuparts-devel/2019-March/008422.html

- - - - -


1 changed file:

- piuparts-report.py


Changes:

=====================================
piuparts-report.py
=====================================
@@ -1617,8 +1617,6 @@ class Section:
             summary = pkgsummary.new_summary()
 
             for reporting_section in reporting_sections:
-                source_done = {}
-                source_todo = {}
                 for binpkg in self._binary_db.get_all_packages():
                     pkgname = binpkg["Package"]
                     state = self._binary_db.get_package_state(pkgname)
@@ -1627,30 +1625,13 @@ class Section:
                     if flag == 'F':
                         block_cnt = self._binary_db.block_count(pkgname)
                     srcpkg = self._binary_db.get_package(pkgname).source()
-                    srcver = self._binary_db.get_package(pkgname).source_version()
-                    latest_srcver = self._source_db.get_test_versions(srcpkg)
                     url = source_summary_url(
                               web_host, self._doc_root,
                               self._config.section, srcpkg)
 
-                    if (srcver != latest_srcver):
-                        # if the binary package is cruft, we don't add it to
-                        # the report, but we keep track to make sure the
-                        # source package is added
-                        source_todo[srcpkg] = url
-                    else:
-                        pkgsummary.add_summary(
-                                       summary, reporting_section, srcpkg,
-                                       flag, block_cnt, url)
-                        source_done[srcpkg] = 1
-                for srcpkg in source_todo:
-                    # source packages that only have outdated binaries are
-                    # waiting for the build, so we add them as 'W'
-                    # (waiting-to-be-tested)
-                    if srcpkg not in source_done:
-                        pkgsummary.add_summary(
-                                       summary, reporting_section, srcpkg,
-                                       'W', 0, source_todo[srcpkg])
+                    pkgsummary.add_summary(
+                                   summary, reporting_section, srcpkg,
+                                   flag, block_cnt, url)
 
             pkgsummary.write_summary(summary, summary_path)
 



View it on GitLab: https://salsa.debian.org/debian/piuparts/commit/17a1e462888e42b85ae17f73b13d8384a93c1e97

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/commit/17a1e462888e42b85ae17f73b13d8384a93c1e97
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20190316/5a90236f/attachment-0001.html>