On Thu, Jan 04, 2018 at 02:44:41PM +0000, Holger Levsen wrote:
> So I made that change in debian/control here locally and then checked
> tracker.d.o/munin but the issue seems to be gone, so I refrained from
> commiting this to git and pushing.
It is gone because I modified the value in the local vcswatch override
database at https://qa.debian.org/cgi-bin/vcswatch?package=munin (if you
log in with a valid Debian SSO certificate a text fields appears and you
can then modify the Vcs-Git value that is in use until the next package
upload).
On a different topic, using https:// instead of git:// is preferred
(since Policy 4.1.3 it's mentioned also there).
At any rate, please check this out:
https://salsa.debian.org/qa/distro-tracker/commit/c4a0814d9aad4bcbb08080bcc089d4b3226dc259
Does it cover your concerns? Do you have any suggestion on the wording?
The diff:
diff --git a/distro_tracker/vendor/debian/templates/debian/vcswatch-action-item.html b/distro_tracker/vendor/debian/templates/debian/vcswatch-action-item.html
index 08b9d5a..9d60392 100644
--- a/distro_tracker/vendor/debian/templates/debian/vcswatch-action-item.html
+++ b/distro_tracker/vendor/debian/templates/debian/vcswatch-action-item.html
@@ -8,8 +8,11 @@ into the archive.
this package seems to have new commits in its VCS. You should consider updating
the debian/changelog and uploading this new version into the archive.
{% elif status == "OLD" %}
-the current version of the package is NOT in its VCS. You should push your
-commits immediately.
+the current version of the package is not in its VCS.<br/>
+Either you need to push your commits, or the information about the package's
+VCS are out of date. A common cause of the latter issue when using the Git VCS
+is not specifying the correct branch when the packaging is not in the default
+one.
{% elif status == "UNREL" %}
this package has been uploaded into the archive but the debian/changelog in the
VCS is still UNRELEASED. You should consider pushing the missing commits
diff --git a/distro_tracker/vendor/debian/tracker_tasks.py b/distro_tracker/vendor/debian/tracker_tasks.py
index 2b0c0a8..6a58437 100644
--- a/distro_tracker/vendor/debian/tracker_tasks.py
+++ b/distro_tracker/vendor/debian/tracker_tasks.py
@@ -2450,20 +2450,20 @@ class UpdateVcsWatchTask(BaseTask):
},
"OLD": {
'description':
- 'The <a href="{url}">VCS repository is NOT up to date</a>, '
- 'push the missing commits.',
+ 'The <a href="{url}">VCS repository is not up to date</a>, '
+ 'consider pushing the missing commits.',
"severity": ActionItem.SEVERITY_HIGH,
},
"UNREL": {
"description":
- 'The <a href="{url}">VCS repository is NOT up to date</a>, '
- 'push the missing commits.',
+ 'The <a href="{url}">VCS repository is not up to date</a>, '
+ 'consider pushing the missing commits.',
"severity": ActionItem.SEVERITY_HIGH,
},
"ERROR": {
"description":
'<a href="{url}">Error while accessing the VCS repository</a>. '
- 'Please troubleshot and fix.',
+ 'Please troubleshot and fix the issue.',
"severity": ActionItem.SEVERITY_HIGH,
},
"DEFAULT": {
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
Attachment:
signature.asc
Description: PGP signature