| Message ID | 20200103151849.10956-11-heiko.thiery@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | pkg-stats json output improvements | expand |
On Fri, 3 Jan 2020 16:18:47 +0100 Heiko Thiery <heiko.thiery@gmail.com> wrote: > Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> > --- > support/scripts/pkg-stats | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > index dd3c6566a0..afd9cacafb 100755 > --- a/support/scripts/pkg-stats > +++ b/support/scripts/pkg-stats > @@ -457,21 +457,22 @@ def check_package_latest_version(packages): > pkg.rm_version['version'] == pkg.current_version > > if pkg.rm_version['status'] == RM_API_STATUS_ERROR: > - pkg.status['version'] = ('warning', 'rm api error') > + pkg.status['version'] = ('warning', 'RM API error') > elif pkg.rm_version['status'] == RM_API_STATUS_NOT_FOUND: > - pkg.status['version'] = ('warning', 'rm package not found') > + pkg.status['version'] = ('warning', 'RM package not found') > > if pkg.rm_version['version'] is None: > pkg.status['version'] = ('warning', 'no upstream version available') > elif pkg.rm_version['version'] != pkg.current_version: > - pkg.status['version'] = ('error', 'package needs update') > + pkg.status['version'] = ('error', 'Package needs update') > else: > - pkg.status['version'] = ('ok', 'up-to-date') > + pkg.status['version'] = ('ok', 'update-to-date') > del http_pool The change up to here is not related to the commit title. Thomas
Am Fr., 3. Jan. 2020 um 16:35 Uhr schrieb Thomas Petazzoni <thomas.petazzoni@bootlin.com>: > > On Fri, 3 Jan 2020 16:18:47 +0100 > Heiko Thiery <heiko.thiery@gmail.com> wrote: > > > Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> > > --- > > support/scripts/pkg-stats | 11 +++++++---- > > 1 file changed, 7 insertions(+), 4 deletions(-) > > > > diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats > > index dd3c6566a0..afd9cacafb 100755 > > --- a/support/scripts/pkg-stats > > +++ b/support/scripts/pkg-stats > > @@ -457,21 +457,22 @@ def check_package_latest_version(packages): > > pkg.rm_version['version'] == pkg.current_version > > > > if pkg.rm_version['status'] == RM_API_STATUS_ERROR: > > - pkg.status['version'] = ('warning', 'rm api error') > > + pkg.status['version'] = ('warning', 'RM API error') > > elif pkg.rm_version['status'] == RM_API_STATUS_NOT_FOUND: > > - pkg.status['version'] = ('warning', 'rm package not found') > > + pkg.status['version'] = ('warning', 'RM package not found') > > > > if pkg.rm_version['version'] is None: > > pkg.status['version'] = ('warning', 'no upstream version available') > > elif pkg.rm_version['version'] != pkg.current_version: > > - pkg.status['version'] = ('error', 'package needs update') > > + pkg.status['version'] = ('error', 'Package needs update') > > else: > > - pkg.status['version'] = ('ok', 'up-to-date') > > + pkg.status['version'] = ('ok', 'update-to-date') > > del http_pool > > The change up to here is not related to the commit title. there I made a mistake > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com
diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index dd3c6566a0..afd9cacafb 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -457,21 +457,22 @@ def check_package_latest_version(packages): pkg.rm_version['version'] == pkg.current_version if pkg.rm_version['status'] == RM_API_STATUS_ERROR: - pkg.status['version'] = ('warning', 'rm api error') + pkg.status['version'] = ('warning', 'RM API error') elif pkg.rm_version['status'] == RM_API_STATUS_NOT_FOUND: - pkg.status['version'] = ('warning', 'rm package not found') + pkg.status['version'] = ('warning', 'RM package not found') if pkg.rm_version['version'] is None: pkg.status['version'] = ('warning', 'no upstream version available') elif pkg.rm_version['version'] != pkg.current_version: - pkg.status['version'] = ('error', 'package needs update') + pkg.status['version'] = ('error', 'Package needs update') else: - pkg.status['version'] = ('ok', 'up-to-date') + pkg.status['version'] = ('ok', 'update-to-date') del http_pool def calculate_stats(packages): stats = defaultdict(int) + stats["packages"] = len(packages) for pkg in packages: # If packages have multiple infra, take the first one. For the # vast majority of packages, the target and host infra are the @@ -743,6 +744,8 @@ def dump_html_all_pkgs(f, packages): def dump_html_stats(f, stats): f.write("<a id=\"results\"></a>\n") f.write("<table>\n") + f.write(" <tr><td>Total number of packages</td><td>%s</td></tr>\n" % + stats["packages"]) infras = [infra[6:] for infra in stats.keys() if infra.startswith("infra-")] for infra in infras: f.write(" <tr><td>Packages using the <i>%s</i> infrastructure</td><td>%s</td></tr>\n" %
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> --- support/scripts/pkg-stats | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)