| Message ID | 1354847827-4902-1-git-send-email-danomimanchego123@gmail.com |
|---|---|
| State | Accepted |
| Commit | 63eabbb11ec31e6629169c8258b4c73b90b6e8b9 |
| Headers | show |
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<danomimanchego123@gmail.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > --- > 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"&& \
>>>>> "Danomi" == Danomi Manchego <danomimanchego123@gmail.com> 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.
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" && \
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 <danomimanchego123@gmail.com> --- package/pkg-download.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)