[pacman-dev] [PATCH 1/4] makepkg: ignore empty global attributes for SRCINFO
--- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 86f8a77..9048676 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2385,7 +2385,7 @@ extract_global_var() { array_build ref "$attr" [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" else - [[ -v $attr ]] && printf -v "$outputvar" %s "${!attr}" + [[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}" fi } -- 2.1.3
--- contrib/updpkgsums.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index 4a9026e..e0524bd 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -82,7 +82,7 @@ fi export BUILDDIR=$(mktemp -d --tmpdir updpkgsums.XXXXXX) trap "rm -rf '$BUILDDIR'" EXIT newsums=$(makepkg -g -p "$buildfile") && rm -f "$buildfile" && - exec awk -v newsums="$newsums" ' + awk -v newsums="$newsums" ' /^[[:blank:]]*(md|sha)[[:digit:]]+sums(_[^=]+)?=/,/\)[[:blank:]]*(#.*)?$/ { if (!w) { print newsums -- 2.1.3
--- contrib/bash_completion.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index 519aa6d..9b4bc38 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -76,7 +76,7 @@ _makepkg() { _get_comp_words_by_ref cur prev if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then opts=('allsource asdeps asroot check clean config force geninteg help holdver ignorearch - install key log needed nobuild nocheck nocolor noconfirm nodeps noextract + install key log needed noarchive nobuild nocheck nocolor noconfirm nodeps noextract noprepare noprogressbar nosign pkg repackage rmdeps sign skipchecksums skipinteg skippgpcheck source syncdeps verifysource version' 'A L R S c d e f g h i m o p r s') -- 2.1.3
--- doc/makepkg.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index e687e05..31a2ef7 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -220,7 +220,7 @@ Environment Variables operations must be supported by this command. If the variable is not set or empty, makepkg will fall back to `pacman'. -**MAKEPKG_CONF=**::"/path/to/file":: +**MAKEPKG_CONF=**"/path/to/file":: Use an alternate config file instead of the +{sysconfdir}/makepkg.conf+ default. -- 2.1.3
On 04/11/14 23:10, Dave Reisner wrote:
--- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 86f8a77..9048676 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2385,7 +2385,7 @@ extract_global_var() { array_build ref "$attr" [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" else - [[ -v $attr ]] && printf -v "$outputvar" %s "${!attr}" + [[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}" fi }
Does this need pulled only when the SRCINFO patch goes in, or is it an independent change and thus needs a better commit title?
On Wed, Nov 05, 2014 at 10:59:00AM +1000, Allan McRae wrote:
On 04/11/14 23:10, Dave Reisner wrote:
--- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 86f8a77..9048676 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2385,7 +2385,7 @@ extract_global_var() { array_build ref "$attr" [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" else - [[ -v $attr ]] && printf -v "$outputvar" %s "${!attr}" + [[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}" fi }
Does this need pulled only when the SRCINFO patch goes in, or is it an independent change and thus needs a better commit title?
It's a real bug which exists in the code now, it just doesn't manifest itself until we leverage the code for SRCINFO generation. I can resend with a different short desc.
On 05/11/14 23:02, Dave Reisner wrote:
On Wed, Nov 05, 2014 at 10:59:00AM +1000, Allan McRae wrote:
On 04/11/14 23:10, Dave Reisner wrote:
--- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 86f8a77..9048676 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2385,7 +2385,7 @@ extract_global_var() { array_build ref "$attr" [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" else - [[ -v $attr ]] && printf -v "$outputvar" %s "${!attr}" + [[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}" fi }
Does this need pulled only when the SRCINFO patch goes in, or is it an independent change and thus needs a better commit title?
It's a real bug which exists in the code now, it just doesn't manifest itself until we leverage the code for SRCINFO generation.
I can resend with a different short desc.
No need to send - push to your branch and I will cherry-pick
On Thu, Nov 06, 2014 at 12:07:11AM +1000, Allan McRae wrote:
On 05/11/14 23:02, Dave Reisner wrote:
On Wed, Nov 05, 2014 at 10:59:00AM +1000, Allan McRae wrote:
On 04/11/14 23:10, Dave Reisner wrote:
--- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 86f8a77..9048676 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2385,7 +2385,7 @@ extract_global_var() { array_build ref "$attr" [[ ${ref[@]} ]] && array_build "$outputvar" "$attr" else - [[ -v $attr ]] && printf -v "$outputvar" %s "${!attr}" + [[ ${!attr} ]] && printf -v "$outputvar" %s "${!attr}" fi }
Does this need pulled only when the SRCINFO patch goes in, or is it an independent change and thus needs a better commit title?
It's a real bug which exists in the code now, it just doesn't manifest itself until we leverage the code for SRCINFO generation.
I can resend with a different short desc.
No need to send - push to your branch and I will cherry-pick
Done -- force updated my 'bugfix' branch. d
participants (3)
-
Allan McRae
-
Dave Reisner
-
Dave Reisner