Patchwork [1,of,5,STABLE] dockerdeb: fix incorrect number of shifts

login
register
mail settings
Submitter Sean Farley
Date April 24, 2016, 2:27 a.m.
Message ID <f0bec77f148405825a8c.1461464875@laptop.local>
Download mbox | patch
Permalink /patch/14780/
State Accepted
Delegated to: Augie Fackler
Headers show

Comments

Sean Farley - April 24, 2016, 2:27 a.m.
# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1461440859 25200
#      Sat Apr 23 12:47:39 2016 -0700
# Branch stable
# Node ID f0bec77f148405825a8c3289823e3981246965dc
# Parent  51f5fae84e4381761c43c6156b3d6caf495529f8
# EXP-Topic docker-ppa
dockerdeb: fix incorrect number of shifts

From the comment, it appears that the original intent was to remove the first
two arguments, so this patch does just that.
Anton Shestakov - April 24, 2016, 6:04 a.m.
24.04.2016, 10:29, "Sean Farley" <sean@farley.io>:
> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1461440859 25200
> # Sat Apr 23 12:47:39 2016 -0700
> # Branch stable
> # Node ID f0bec77f148405825a8c3289823e3981246965dc
> # Parent 51f5fae84e4381761c43c6156b3d6caf495529f8
> # EXP-Topic docker-ppa
> dockerdeb: fix incorrect number of shifts
>
> From the comment, it appears that the original intent was to remove the first
> two arguments, so this patch does just that.

Yep, the number of arguments changed from 1 to 2 in 9b86d29867a5 (and I overlooked that).

> diff --git a/contrib/dockerdeb b/contrib/dockerdeb
> --- a/contrib/dockerdeb
> +++ b/contrib/dockerdeb
> @@ -9,11 +9,11 @@ export ROOTDIR=$(cd $BUILDDIR/.. > /dev/
>  checkdocker
>
>  DISTID="$1"
>  CODENAME="$2"
>  PLATFORM="$1-$2"
> -shift # extra params are passed to build process
> +shift; shift # extra params are passed to build process
>
>  OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM}
>
>  initcontainer $PLATFORM

LGTM.

Patch

diff --git a/contrib/dockerdeb b/contrib/dockerdeb
--- a/contrib/dockerdeb
+++ b/contrib/dockerdeb
@@ -9,11 +9,11 @@  export ROOTDIR=$(cd $BUILDDIR/.. > /dev/
 checkdocker
 
 DISTID="$1"
 CODENAME="$2"
 PLATFORM="$1-$2"
-shift # extra params are passed to build process
+shift; shift # extra params are passed to build process
 
 OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM}
 
 initcontainer $PLATFORM