[pacman-dev] [PATCH] Fix leading whitespace in makepkg; fix typo in pacman-optimize

[Allan McRae]

On 01/11/13 05:41, Jason St. John wrote:
> Signed-off-by: Jason St. John <jstjohn at purdue.edu>
> ---
> "cannot" is the preferred spelling. Only 1 instance of "can not" exists
> in pacman.


Why to completely separate changes in one patch.   Stick the makepkg
change in the other whitespace patch.


>  scripts/makepkg.sh.in         | 2 +-
>  scripts/pacman-optimize.sh.in | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 126b5c5..82f9d4a 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -2490,7 +2490,7 @@ usage() {
>  	printf -- "$(gettext "Options:")\n"
>  	printf -- "$(gettext "  -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT"
>  	printf -- "$(gettext "  -c, --clean      Clean up work files after build")\n"
> -        printf -- "$(gettext "  -C, --cleanbuild Remove %s dir before building the package")\n" "\$srcdir/"
> +	printf -- "$(gettext "  -C, --cleanbuild Remove %s dir before building the package")\n" "\$srcdir/"
>  	printf -- "$(gettext "  -d, --nodeps     Skip all dependency checks")\n"
>  	printf -- "$(gettext "  -e, --noextract  Do not extract source files (use existing %s dir)")\n" "\$srcdir/"
>  	printf -- "$(gettext "  -f, --force      Overwrite existing package")\n"
> diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in
> index 47fbb49..e0caf4d 100644
> --- a/scripts/pacman-optimize.sh.in
> +++ b/scripts/pacman-optimize.sh.in
> @@ -122,7 +122,7 @@ fi
>  touch "$lockfile"
>  
>  workdir=$(mktemp -d "${TMPDIR:-/tmp}/pacman-optimize.XXXXXXXXXX") ||
> -	die_r "$(gettext "Can not create temp directory for database building.")\n" >&2
> +	die_r "$(gettext "Cannot create temp directory for database building.")\n" >&2
>  

While fixing this, can you make change temp to temporary.  This is just
lazy without reason.

>  # step 1: sum the old db
>  msg "$(gettext "MD5sum'ing the old database...")"
>