From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Sun, 09 Dec 2012 16:12:02 +0100 Subject: [Buildroot] [PATCH] pkg-download.mk: fix multiple matches in shallow clone test In-Reply-To: <1354847827-4902-1-git-send-email-danomimanchego123@gmail.com> References: <1354847827-4902-1-git-send-email-danomimanchego123@gmail.com> Message-ID: <50C4AA42.7020401@mind.be> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On 07/12/12 03:37, Danomi Manchego wrote: > 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 Acked-by: Arnout Vandecappelle (Essensium/Mind) > --- > package/pkg-download.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-download.mk b/package/pkg-download.mk > index ea01b05..1705fcd 100644 > --- a/package/pkg-download.mk > +++ b/package/pkg-download.mk > @@ -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"&& \ -- 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