Make "make update-packages" idempotent
ClosedPublic
Actions

Authored by asomers on Thu, May 7, 6:20 PM.

Details

Reviewers

ivy
emaste

Group Reviewers

pkgbase

Commits

rG09a53a56b7a6: Make "make update-packages" idempotent
rG89a0148521ae: Make "make update-packages" idempotent
rGbd1e789b8452: Make "make update-packages" idempotent

Summary

If the user runs "make update-packages" without bumping BRANCH, then it
isn't possible to copy packages from the old location to the new one
(because the two locations are the same). So just skip that step.

Sponsored by: ConnectWise
PR: 295085
MFC after: 1 week

Test Plan

Ran "make update-packages" twice in a row

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

asomers created this revision.Thu, May 7, 6:20 PM

Herald added a subscriber: imp. · View Herald TranscriptThu, May 7, 6:20 PM

asomers requested review of this revision.Thu, May 7, 6:20 PM

Harbormaster completed remote builds in B72883: Diff 177382.Thu, May 7, 6:20 PM

one potential issue here is that the user might not realise why their new packages aren't being used if the version number didn't change. but the previous behaviour does not seem intentional, and i think this is better than an error.

This revision is now accepted and ready to land.Fri, May 8, 1:25 AM

@brd this is what I was talking about when I complained about errors running "make update-packages".

In D56872#1303006, @asomers wrote:

@brd this is what I was talking about when I complained about errors running "make update-packages".

Oh, I see.. I never saw this because I only run CURRENT and so all the packages are datestamped.

LGTM, but is it worth adding an echo in the case that PKG_VERSION didn't change so that we always emit some message here?

Something like

.if defined(PKG_VERSION_FROM_DIR)
    .if ${PKG_VERSION} != ${PKG_VERSION_FROM}
        @echo "==> Package version ${PKG_VERSION} unchanged, keeping old package set"
    .else
        ...
     .endif
.endif

Or actually, avoiding more indentation, changing the existing else case to

.elif defined(PKG_VERSION_FROM_DIR)
    @echo version not changed
.else
    @echo bootstrapping repository, not checking...
.endif

In D56872#1303138, @emaste wrote:
LGTM, but is it worth adding an echo in the case that PKG_VERSION didn't change so that we always emit some message here?

Something like
.if defined(PKG_VERSION_FROM_DIR)
    .if ${PKG_VERSION} != ${PKG_VERSION_FROM}
        @echo "==> Package version ${PKG_VERSION} unchanged, keeping old package set"
    .else
        ...
     .endif
.endif
Or actually, avoiding more indentation, changing the existing else case to
.elif defined(PKG_VERSION_FROM_DIR)
    @echo version not changed
.else
    @echo bootstrapping repository, not checking...
.endif

Ok, I'll commit it with this change.

Closed by commit rGbd1e789b8452: Make "make update-packages" idempotent (authored by asomers). · Explain WhyFri, May 8, 3:19 PM

This revision was automatically updated to reflect the committed changes.

asomers added a commit: rGbd1e789b8452: Make "make update-packages" idempotent.

asomers added a commit: rG89a0148521ae: Make "make update-packages" idempotent.Wed, May 13, 7:24 PM

cperciva added a commit: rG09a53a56b7a6: Make "make update-packages" idempotent.Thu, May 14, 7:06 PM