Patchwork [HARDY,SAUCE] Allow insertchanges to work in later version chroots

login
register
mail settings
Submitter Steve Conklin
Date March 3, 2011, 10:34 p.m.
Message ID <1299191660.9355.218.camel@xps-1>
Download mbox | patch
Permalink /patch/85350/
State New
Headers show

Comments

Steve Conklin - March 3, 2011, 10:34 p.m.
This is a very minor change which only affects one maintenance script.
No changes to kernel code.

The command "git-log" was used in the script, which prevented the
insertchanges target from executing unless you were in a hardy chroot.

This changes that to "git log". I have confirmed that it still works in
a hardy chroot, and it also now works in a Lucid chroot.

Signed-off-by: Steve Conklin <sconklin@canonical.com>
---
 debian/rules.d/1-maintainer.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Tim Gardner - March 4, 2011, 12:05 a.m.
On 03/03/2011 03:34 PM, Steve Conklin wrote:
> This is a very minor change which only affects one maintenance script.
> No changes to kernel code.
>
> The command "git-log" was used in the script, which prevented the
> insertchanges target from executing unless you were in a hardy chroot.
>
> This changes that to "git log". I have confirmed that it still works in
> a hardy chroot, and it also now works in a Lucid chroot.
>
> Signed-off-by: Steve Conklin<sconklin@canonical.com>
> ---
>   debian/rules.d/1-maintainer.mk |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/debian/rules.d/1-maintainer.mk
> b/debian/rules.d/1-maintainer.mk
> index 4625252..d088596 100644
> --- a/debian/rules.d/1-maintainer.mk
> +++ b/debian/rules.d/1-maintainer.mk
> @@ -66,7 +66,7 @@ endif
>   	@echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)"
>
>   printchanges:
> -	@git-log Ubuntu-$(release)-$(prev_revision)..HEAD | \
> +	@git log Ubuntu-$(release)-$(prev_revision)..HEAD | \
>   		perl -w -f debian/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
>
>   insertchanges:
>

This is a no-brainer, though I wouldn't call this a SAUCE patch, rather 
I think its a [Config] change which is what I've been using for debian 
directory patches. Otherwise,

Acked-by: Tim Gardner <tim.gardner@canonical.com>
Stefan Bader - March 4, 2011, 9:25 a.m.
On 03/03/2011 11:34 PM, Steve Conklin wrote:
> This is a very minor change which only affects one maintenance script.
> No changes to kernel code.
> 
> The command "git-log" was used in the script, which prevented the
> insertchanges target from executing unless you were in a hardy chroot.
> 
> This changes that to "git log". I have confirmed that it still works in
> a hardy chroot, and it also now works in a Lucid chroot.
> 
> Signed-off-by: Steve Conklin <sconklin@canonical.com>
> ---
>  debian/rules.d/1-maintainer.mk |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/debian/rules.d/1-maintainer.mk
> b/debian/rules.d/1-maintainer.mk
> index 4625252..d088596 100644
> --- a/debian/rules.d/1-maintainer.mk
> +++ b/debian/rules.d/1-maintainer.mk
> @@ -66,7 +66,7 @@ endif
>  	@echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)"
>  
>  printchanges:
> -	@git-log Ubuntu-$(release)-$(prev_revision)..HEAD | \
> +	@git log Ubuntu-$(release)-$(prev_revision)..HEAD | \
>  		perl -w -f debian/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
>  
>  insertchanges:
> 
Contentwise: no-brainer
Subject maybe: UBUNTU: (buildenv) ...

Acked-by: Stefan Bader <stefan.bader@canonical.com>
Tim Gardner - March 4, 2011, 1:59 p.m.
On 03/03/2011 03:34 PM, Steve Conklin wrote:
> This is a very minor change which only affects one maintenance script.
> No changes to kernel code.
>
> The command "git-log" was used in the script, which prevented the
> insertchanges target from executing unless you were in a hardy chroot.
>
> This changes that to "git log". I have confirmed that it still works in
> a hardy chroot, and it also now works in a Lucid chroot.
>
> Signed-off-by: Steve Conklin<sconklin@canonical.com>
> ---
>   debian/rules.d/1-maintainer.mk |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/debian/rules.d/1-maintainer.mk
> b/debian/rules.d/1-maintainer.mk
> index 4625252..d088596 100644
> --- a/debian/rules.d/1-maintainer.mk
> +++ b/debian/rules.d/1-maintainer.mk
> @@ -66,7 +66,7 @@ endif
>   	@echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)"
>
>   printchanges:
> -	@git-log Ubuntu-$(release)-$(prev_revision)..HEAD | \
> +	@git log Ubuntu-$(release)-$(prev_revision)..HEAD | \
>   		perl -w -f debian/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
>
>   insertchanges:
>

applied
Andy Whitcroft - March 16, 2011, 6:49 p.m.
On Fri, Mar 04, 2011 at 10:25:05AM +0100, Stefan Bader wrote:
> On 03/03/2011 11:34 PM, Steve Conklin wrote:
> > This is a very minor change which only affects one maintenance script.
> > No changes to kernel code.
> > 
> > The command "git-log" was used in the script, which prevented the
> > insertchanges target from executing unless you were in a hardy chroot.
> > 
> > This changes that to "git log". I have confirmed that it still works in
> > a hardy chroot, and it also now works in a Lucid chroot.
> > 
> > Signed-off-by: Steve Conklin <sconklin@canonical.com>
> > ---
> >  debian/rules.d/1-maintainer.mk |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/debian/rules.d/1-maintainer.mk
> > b/debian/rules.d/1-maintainer.mk
> > index 4625252..d088596 100644
> > --- a/debian/rules.d/1-maintainer.mk
> > +++ b/debian/rules.d/1-maintainer.mk
> > @@ -66,7 +66,7 @@ endif
> >  	@echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)"
> >  
> >  printchanges:
> > -	@git-log Ubuntu-$(release)-$(prev_revision)..HEAD | \
> > +	@git log Ubuntu-$(release)-$(prev_revision)..HEAD | \
> >  		perl -w -f debian/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
> >  
> >  insertchanges:
> > 
> Contentwise: no-brainer
> Subject maybe: UBUNTU: (buildenv) ...

I think officially thats just 'UBUNTU: ...'

> Acked-by: Stefan Bader <stefan.bader@canonical.com>

-apw

Patch

diff --git a/debian/rules.d/1-maintainer.mk
b/debian/rules.d/1-maintainer.mk
index 4625252..d088596 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -66,7 +66,7 @@  endif
 	@echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)"
 
 printchanges:
-	@git-log Ubuntu-$(release)-$(prev_revision)..HEAD | \
+	@git log Ubuntu-$(release)-$(prev_revision)..HEAD | \
 		perl -w -f debian/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
 
 insertchanges: