| Message ID | 20210721221338.159114-3-apw@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | LP:1928921 LRMv5 -- switch primary version handling to kernel-versions data set | expand |
On 22.07.21 00:13, Andy Whitcroft wrote: > Copy over the debian/tracking-bug information as this (will) contain the > SRU cycle number. > > BugLink: https://bugs.launchpad.net/bugs/1928921 > Signed-off-by: Andy Whitcroft <apw@canonical.com> > --- > update-version | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/update-version b/update-version > index 2e8130c..21d35c6 100755 > --- a/update-version > +++ b/update-version > @@ -53,8 +53,14 @@ fi > > # Update things from the primary package. > if [ "$no_update" = 'false' ]; then > + thing='debian/tracking-bug' ^why not call this thing tbfile?... > + cp -p "$master_dir/$branch/tracking-bug" "$thing" || exit 1 > + if ! git diff --exit-code -- "$thing" >/dev/null; then > + git commit -m "UBUNTU: $thing -- update from master" -s -- "$thing" > + else > + echo "$thing: no changes from master" > + fi > for thing in \ > - debian/dkms-versions \ > debian/scripts/misc/git-ubuntu-log \ > debian/scripts/dkms-build \ > debian/scripts/dkms-build--nvidia-N \ >
On Thu, Jul 22, 2021 at 02:23:56PM +0200, Stefan Bader wrote: > On 22.07.21 00:13, Andy Whitcroft wrote: > > Copy over the debian/tracking-bug information as this (will) contain the > > SRU cycle number. > > > > BugLink: https://bugs.launchpad.net/bugs/1928921 > > Signed-off-by: Andy Whitcroft <apw@canonical.com> > > --- > > update-version | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/update-version b/update-version > > index 2e8130c..21d35c6 100755 > > --- a/update-version > > +++ b/update-version > > @@ -53,8 +53,14 @@ fi > > # Update things from the primary package. > > if [ "$no_update" = 'false' ]; then > > + thing='debian/tracking-bug' > ^why not call this thing tbfile?... It ended up being thing because the code there is duplicated from the loop just below which also uses thing. Neither is a very good name. In these cases it is the `copy_file` or something similar. Will clean this up. > > > + cp -p "$master_dir/$branch/tracking-bug" "$thing" || exit 1 > > + if ! git diff --exit-code -- "$thing" >/dev/null; then > > + git commit -m "UBUNTU: $thing -- update from master" -s -- "$thing" > > + else > > + echo "$thing: no changes from master" > > + fi > > for thing in \ > > - debian/dkms-versions \ > > debian/scripts/misc/git-ubuntu-log \ > > debian/scripts/dkms-build \ > > debian/scripts/dkms-build--nvidia-N \ > > -apw
diff --git a/update-version b/update-version index 2e8130c..21d35c6 100755 --- a/update-version +++ b/update-version @@ -53,8 +53,14 @@ fi # Update things from the primary package. if [ "$no_update" = 'false' ]; then + thing='debian/tracking-bug' + cp -p "$master_dir/$branch/tracking-bug" "$thing" || exit 1 + if ! git diff --exit-code -- "$thing" >/dev/null; then + git commit -m "UBUNTU: $thing -- update from master" -s -- "$thing" + else + echo "$thing: no changes from master" + fi for thing in \ - debian/dkms-versions \ debian/scripts/misc/git-ubuntu-log \ debian/scripts/dkms-build \ debian/scripts/dkms-build--nvidia-N \
Copy over the debian/tracking-bug information as this (will) contain the SRU cycle number. BugLink: https://bugs.launchpad.net/bugs/1928921 Signed-off-by: Andy Whitcroft <apw@canonical.com> --- update-version | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)