Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2022-04-11 23:49:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Mon Apr 11 23:49:04 2022 rev:424 rq:969138 version:20220411.23ca4c85
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2022-04-08 22:45:41.963152040 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1900/openSUSE-release-tools.changes
2022-04-11 23:50:32.370183356 +0200
@@ -1,0 +2,6 @@
+Mon Apr 11 08:41:07 UTC 2022 - [email protected]
+
+- Update to version 20220411.23ca4c85:
+ * Write points to the DB only at the end of interval
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20220408.1d368407.obscpio
New:
----
openSUSE-release-tools-20220411.23ca4c85.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.P9Vm9B/_old 2022-04-11 23:50:33.170174229 +0200
+++ /var/tmp/diff_new_pack.P9Vm9B/_new 2022-04-11 23:50:33.170174229 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20220408.1d368407
+Version: 20220411.23ca4c85
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.P9Vm9B/_old 2022-04-11 23:50:33.242173408 +0200
+++ /var/tmp/diff_new_pack.P9Vm9B/_new 2022-04-11 23:50:33.246173362 +0200
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">de6a64c464cedffcfb032613e7f87378f856561a</param>
+ <param
name="changesrevision">67d6cc4729846a109703582adbfa1515a52434de</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20220408.1d368407.obscpio ->
openSUSE-release-tools-20220411.23ca4c85.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220408.1d368407/metrics/access/aggregate.php
new/openSUSE-release-tools-20220411.23ca4c85/metrics/access/aggregate.php
--- old/openSUSE-release-tools-20220408.1d368407/metrics/access/aggregate.php
2022-04-08 08:54:29.000000000 +0200
+++ new/openSUSE-release-tools-20220411.23ca4c85/metrics/access/aggregate.php
2022-04-11 10:40:30.000000000 +0200
@@ -213,12 +213,21 @@
function aggregate($intervals, &$merged, $date, $date_previous, $data, $tags =
[], $prefix = 'access')
{
foreach ($intervals as $interval => $format) {
- if ($interval == 'FQ')
+ if ($interval == 'FQ') {
$value = format_FQ($date);
- elseif ($interval == 'FY')
+ if (isset($date_previous))
+ $value_previous = format_FQ($date_previous);
+ }
+ elseif ($interval == 'FY') {
$value = format_FY($date);
- else
+ if (isset($date_previous))
+ $value_previous = format_FY($date_previous);
+ }
+ else {
$value = $date->format($format);
+ if (isset($date_previous))
+ $value_previous = $date_previous->format($format);
+ }
if (!isset($merged[$interval]) || $value != $merged[$interval]['value']) {
if (!empty($merged[$interval]['data'])) {
$summary = summarize($merged[$interval]['data']);
@@ -226,15 +235,17 @@
$summary = ['-' => $summary['-']];
}
- $count = write_summary($interval, $date_previous, $summary, $tags,
$prefix);
+ if (isset($value_previous) and $value != $value_previous) {
+ $count = write_summary($interval, $date_previous, $summary, $tags,
$prefix);
- if ($prefix == 'access') {
- $summary =
summarize_product_plus_key($merged[$interval]['data']['total_image_product']);
- $count += write_summary_product_plus_key($interval, $date_previous,
$summary, 'image');
- }
+ if ($prefix == 'access') {
+ $summary =
summarize_product_plus_key($merged[$interval]['data']['total_image_product']);
+ $count += write_summary_product_plus_key($interval,
$date_previous, $summary, 'image');
+ }
- error_log("[$prefix] [$interval] [{$merged[$interval]['value']}] wrote
$count points at " .
- $date_previous->format('Y-m-d') . " spanning " .
$merged[$interval]['data']['days'] . ' day(s)');
+ error_log("[$prefix] [$interval] [{$merged[$interval]['value']}]
wrote $count points at " .
+ $date_previous->format('Y-m-d') . " spanning " .
$merged[$interval]['data']['days'] . ' day(s)');
+ }
}
// Reset merge data to current data.
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.P9Vm9B/_old 2022-04-11 23:50:33.830166699 +0200
+++ /var/tmp/diff_new_pack.P9Vm9B/_new 2022-04-11 23:50:33.830166699 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20220408.1d368407
-mtime: 1649400869
-commit: 1d36840733e12fc8c9eef0c089b152e61551c270
+version: 20220411.23ca4c85
+mtime: 1649666430
+commit: 23ca4c858d7f93f3847ccc1af8c0fec73c1eb10d
