openSUSE / scm-staging

Library & tools for staging pull requests from gitea in the Open Build Service
GNU General Public License v2.0
2 stars 6 forks source link

src.opensuse.org -> OBS robot corrupts generated SR #41

Closed mcepl closed 1 year ago

mcepl commented 1 year ago

I have created https://build.opensuse.org/request/show/1099290 by submitting a pull request in src.opensuse.org and that has only changes in .spec a _scmsync.obsinfo and completely ignores changes (from the original pull request) to *.changes and the changed patch file.

mcepl commented 1 year ago

The problem is that the package in src.opensuse.org/pool/vis is out of sync with Factory .

If you compare https://src.opensuse.org/pool/vis/src/branch/factory/vis.changes and https://build.opensuse.org/package/view_file/openSUSE:Factory/vis/vis.changes?expand=1 then you'll see that the git package does not have all the changes yet. You simply updated the changelog to be equal to Factory, but also changed the spec. factory-auto however only sees the spec update and no changelog change and thus it declines your SR.

Well, that is not correct. If you take a look at https://src.opensuse.org/mcepl_pkgs/vis/commit/eef8b3806a4b96f058f17d72b5d7b9ad881768cb then in fact I DID make changes to *.changes. And then there is that whole patch, which was added as well.

dcermak commented 1 year ago

The problem is that the package in src.opensuse.org/pool/vis is out of sync with Factory . If you compare https://src.opensuse.org/pool/vis/src/branch/factory/vis.changes and https://build.opensuse.org/package/view_file/openSUSE:Factory/vis/vis.changes?expand=1 then you'll see that the git package does not have all the changes yet. You simply updated the changelog to be equal to Factory, but also changed the spec. factory-auto however only sees the spec update and no changelog change and thus it declines your SR.

Well, that is not correct. If you take a look at https://src.opensuse.org/mcepl_pkgs/vis/commit/eef8b3806a4b96f058f17d72b5d7b9ad881768cb then in fact I DID make changes to *.changes. And then there is that whole patch, which was added as well.

It is correct. You made changes in commit eef8b3806a4b96f058f17d72b5d7b9ad881768cb, but that's not how submit requests work. We are not forwarding a diff, we are creating a package based on commit eef8b3806a4b96f058f17d72b5d7b9ad881768cb and sending that to Factory.

If you try the following:

❯ git clone https://src.opensuse.org/mcepl_pkgs/vis
# snip
❯ osc co openSUSE:Factory/vis
# snip
❯ diff vis/ openSUSE:Factory/vis/
Only in vis/: .git
Only in vis/: .gitattributes
Only in openSUSE:Factory/vis/: .osc
diff '--color=auto' vis/vis.spec openSUSE:Factory/vis/vis.spec
40d39
< Suggests:       par_text
41a41
> Suggests:       par_text
65c65
< %make_build -C test/core
---
> make -C test/core
67c67
< %make_build -C test/vis
---
> make -C test/vis

You'll see that the packages are more or less identical.

mcepl commented 1 year ago

I see, so it is truly problem of spool/vis being hopefully behind the times.

dirkmueller commented 1 year ago

pool/vis has been resynced with rpm, so now you can go ahead.

mcepl commented 1 year ago

Let’s see https://src.opensuse.org/pool/vis/pulls/5 and https://build.opensuse.org/request/show/1099712