Skip to contentSkip to conversation

pkg-download.mk: fix multiple matches in shallow clone test

PATCH New Danomi Manchego 3 participants 3 messages Dec 7, 2012 – Dec 9, 2012

lore
Share & tools
lore

Danomi Manchego

author
#0 lore raw

PATCH 1/1 pkg-download.mk: fix multiple matches in shallow clone test

Move the git reference directly to git-ls-remote rather than piping the output to grep, to help avoid reporting partial matches rather than the actual requested reference. Also, add quotes to protest "test" from failing when multiple strings are reported.

Signed-off-by Danomi Manchego <[email protected]>
---
 package/pkg-download.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-download.mk +1 -1
index ea01b05..1705fcd 100644
@@ -82,7 +82,7 @@ domainseparator=$(if $(1),$(1),/)
 define DOWNLOAD_GIT
 	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
 	(pushd $(DL_DIR) > /dev/null && \
-	 ((test `git ls-remote  $($(PKG)_SITE) | cut -f 2- | grep $($(PKG)_DL_VERSION)` && \
+	 ((test "`git ls-remote $($(PKG)_SITE) $($(PKG)_DL_VERSION)`" && \
 	   echo "Doing shallow clone" && \
 	   $(GIT) clone --depth 1 -b $($(PKG)_DL_VERSION) --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME)) || \
 	  (echo "Doing full clone" && \
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 pkg-download.mk: fix multiple matches in shallow clone test

Quoted 7 lines · Danomi Manchego

Move the git reference directly to git-ls-remote rather than piping the output to grep, to help avoid reporting partial matches rather than the actual requested reference. Also, add quotes to protest "test" from failing when multiple strings are reported.

Signed-off-by Danomi Manchego<[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Quoted 17 lines
---
  package/pkg-download.mk |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-download.mk +1 -1
index ea01b05..1705fcd 100644
@@ -82,7 +82,7 @@ domainseparator=$(if $(1),$(1),/)
  define DOWNLOAD_GIT
  	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
  	(pushd $(DL_DIR)>  /dev/null&&  \
-	 ((test `git ls-remote  $($(PKG)_SITE) | cut -f 2- | grep $($(PKG)_DL_VERSION)`&&  \
+	 ((test "`git ls-remote $($(PKG)_SITE) $($(PKG)_DL_VERSION)`"&&  \
  	   echo "Doing shallow clone"&&  \
  	   $(GIT) clone --depth 1 -b $($(PKG)_DL_VERSION) --bare $($(PKG)_SITE) $($(PKG)_BASE_NAME)) || \
  	  (echo "Doing full clone"&&  \
Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#2 lore raw

PATCH 1/1 pkg-download.mk: fix multiple matches in shallow clone test

In reply to Danomi Manchego
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Danomi" == Danomi Manchego <[email protected]> writes:

Danomi> Move the git reference directly to git-ls-remote rather than Danomi> piping the output to grep, to help avoid reporting partial Danomi> matches rather than the actual requested reference. Also, Danomi> add quotes to protest "test" from failing when multiple Danomi> strings are reported.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard