On Mon, Jan 16, 2023 at 8:06 AM Miro Hrončok <mhroncok@redhat.com> wrote:
On 16. 01. 23 14:57, Richard Shaw wrote:
>
> Since `fedpkg scratch-build` bombs out with an error if you've made local
> changes I propose a slight modification:
>
> If no changes are made then it does a normal scratch build for the "does this
> still build / not build" 1% use case
>
> If there are local changes it automatically uploads an SRPM for the 99% use case.

I love this.

$ fedpkg scratchbuild  / $ fedpkg build --scratch
Uncommitted changes found, uploading SRPM...

> If you end up in a weird state, i.e. made changes but for some reason want to
> do a "normal" scratch build you have a few different ways to accomplish that.

That was already impossible:

$ fedpkg --release rawhide scratch-build
Could not execute scratch_build: .../python3.9 has uncommitted changes.  Use
git status to see details
Try option --srpm to make scratch build from local changes.

Someone mentioned it's possible to specify a specific commit to build from? I don't know I haven't tried. The other option which is what I would use would to use `git stash` / scratch build / `git stash apply`.

Thanks,
Richard