Help with new package version?

[Benjamin Redelings]

Hi,

I've released a new version 3.0.3 of bali-phy, and I realize that I 
don't understand how to manage the salsa repo using git.  I've tried 
something like this (mostly locally), but I'm pretty sure there is a way 
of doing this with gbp that is recommended instead:


    git fetch upstream
    git fetch upstream --tags
    git checkout upstream
    git merge -X theirs 3.0.3
    git tag upstream/3.0.3+dfsg
    git checkout master
    git merge upstream

I also tried gbp dch, but it tried to create version 3.0.2+dfsg-2 
instead of 3.0.3+dfsg-1.  Would it be possible to give me the quick 
overview?  My apologies for the basic nature of this question.


-BenRI

Re: RRID update on salsa on packages starting with A+B

[Dylan Aïssi]

Hi Steffen, hi Andreas,

2018-03-28 14:16 GMT+02:00 Andreas Tille :
>
>> Via salsa, though, well, not. Should lintian invoke yamllint, possibly?
>
> As far as I know syntax errors in upstream files are fetched by lintian.
> Its the downside of just using the not yet uploaded commits as data
> input that we do not run lintian on these.
>

Currently, the lintian checks for integrity of d/u/metadata are
disabled due to some security problem [1] but maybe should be
re-enabled soon [2].

Best,
Dylan

[1] 
https://anonscm.debian.org/git/lintian/lintian.git/commit/checks/upstream-metadata.pm?id=6119d49c3b
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=862373

Re: RRID update on salsa on packages starting with A+B

[Andreas Tille]

On Wed, Mar 28, 2018 at 02:10:33PM +0200, Steffen Möller wrote:
> 
> > Checking UDD log
> > 
> > blends_prospective_gatherer.log:2018-03-27 08:32:05,582 - ERROR - (110): 
> > Scanner error in file 
> > /srv/udd.debian.org/mirrors/machine-readable/a/artemis.upstream of 
> > debian-med: mapping values are not allowed here
> > blends_prospective_gatherer.log:   Entry: artemis
> 
> Excellent. Thank you (and yamllint) for spotting that.

You are welcome.
 
> Concerning yamllint I am a routine user whenever I edit via the command
> line. And I also keep fixing the long lines.

Nice. :-)
 
> Via salsa, though, well, not. Should lintian invoke yamllint, possibly?

As far as I know syntax errors in upstream files are fetched by lintian.
Its the downside of just using the not yet uploaded commits as data
input that we do not run lintian on these.

Kind regards

 Andreas.

-- 
http://fam-tille.de

Re: RRID update on salsa on packages starting with A+B

[Andreas Tille]

On Wed, Mar 28, 2018 at 12:03:54PM +0200, Steffen Möller wrote:
> But I found artemis
> (https://salsa.debian.org/med-team/artemis/tree/master/debian/upstream)
> which was not touched for a while and looks syntactically just fine but has
> its RRIDs not shown.

Checking UDD log

blends_prospective_gatherer.log:2018-03-27 08:32:05,582 - ERROR - (110): 
Scanner error in file 
/srv/udd.debian.org/mirrors/machine-readable/a/artemis.upstream of debian-med: 
mapping values are not allowed here
blends_prospective_gatherer.log:   Entry: artemis


Checking package:

$ yamllint debian/upstream/metadata
debian/upstream/metadata
  1:1   warning  missing document start "---"  (document-start)
  2:81  errorline too long (111 > 80 characters)  (line-length)
  2:111 errortrailing spaces  (trailing-spaces)
  3:81  errorline too long (126 > 80 characters)  (line-length)
  12:81 errorline too long (82 > 80 characters)  (line-length)
  13:81 errorline too long (139 > 80 characters)  (line-length)
  23:81 errorline too long (83 > 80 characters)  (line-length)
  24:81 errorline too long (164 > 80 characters)  (line-length)
  25:81 errorline too long (104 > 80 characters)  (line-length)
  34:81 errorline too long (84 > 80 characters)  (line-length)
  41:9  errorsyntax error: mapping values are not allowed here

Well, yamllint is a bit picky but the mapping values error matches the
UDD importer.

So lets have a look:

$ git diff
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 4bede0a..a9906a8 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -37,5 +37,5 @@ Registry:
Entry: SCR_004267
  - Name: OMICtools
Entry: OMICS_00903
- - Name; bio.tools
+ - Name: bio.tools
Entry: artemis

... voila, the bug in question vanished.
 
> Please also have an eye on clonalframe
> (https://salsa.debian.org/med-team/clonalframe/tree/master/debian/upstream)
> which was not updated even though the other changes of mine seem to be all
> in.

Same here.  Importer says:

blends_prospective_gatherer.log:2018-03-27 08:34:50,809 - ERROR - (110): 
Scanner error in file 
/srv/udd.debian.org/mirrors/machine-readable/c/clonalframe.upstream of 
debian-med: mapping values are not allowed here


$ yamllint debian/upstream/metadata
debian/upstream/metadata
  1:1   warning  missing document start "---"  (document-start)
  21:10 errorsyntax error: mapping values are not allowed here


$ git diff
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 79c7b56..98566d5 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -17,5 +17,5 @@ Registry:
 Entry: SCR_016060
   - Name: bio.tools
 Entry: NA
-  - Name. OMICtools
+  - Name: OMICtools
 Entry: NA


So please use yamllint on all your updates - if not on all at least
those that are suspicious since not showing up on the sentinel page.  It
seems just editing in Salsa online is a bit error prone.

>From time to time (every half year or so) I'm doing some QA on the UDD
log but inbetween I will not notice those things.  Here is the full list
of yaml issues in upstream files:

$ grep "ERROR.*\.upstream of" blends_prospective_gatherer.log 
2018-03-27 08:32:05,582 - ERROR - (110): Scanner error in file 
/srv/udd.debian.org/mirrors/machine-readable/a/artemis.upstream of debian-med: 
mapping values are not allowed here
2018-03-27 08:33:15,614 - ERROR - (110): Scanner error in file 
/srv/udd.debian.org/mirrors/machine-readable/o/octave-stk.upstream of 
pkg-octave: mapping values are not allowed here
2018-03-27 08:33:17,622 - ERROR - (110): Scanner error in file 
/srv/udd.debian.org/mirrors/machine-readable/o/octave-divand.upstream of 
pkg-octave: mapping values are not allowed here
2018-03-27 08:34:00,876 - ERROR - (110): Scanner error in file 
/srv/udd.debian.org/mirrors/machine-readable/r/rapmap.upstream of debian-med: 
mapping values are not allowed here
2018-03-27 08:34:50,809 - ERROR - (110): Scanner error in file 
/srv/udd.debian.org/mirrors/machine-readable/c/clonalframe.upstream of 
debian-med: mapping values are not allowed here


> I'll wait for tomorrow to indicate the others. Anyway, good to hear that no
> extra upload is required.

I can confirm that for this kind of data no upload was required for
years. 

Kind regards

  Andreas.

-- 
http://fam-tille.de

Re: RRID update on salsa on packages starting with A+B

[Steffen Möller]

Hi Andreas,

I'll get to the other points of your fine reply a bit later. The easy 
ones first


On 3/27/18 9:04 AM, Andreas Tille wrote:

Anyway. I came across

  * one or two entries

Which ones?


I had thought this would be dead easy to answer and then I added quite a 
few more references since indeed there was no RRID assigned, yet. Hm. 
Did I sometimes close the salsa editing window prior to pushing the edit?


But I found artemis 
(https://salsa.debian.org/med-team/artemis/tree/master/debian/upstream) 
which was not touched for a while and looks syntactically just fine but 
has its RRIDs not shown.


Please also have an eye on clonalframe 
(https://salsa.debian.org/med-team/clonalframe/tree/master/debian/upstream) 
which was not updated even though the other changes of mine seem to be 
all in.


I'll wait for tomorrow to indicate the others. Anyway, good to hear that 
no extra upload is required.


Steffen