| Message ID | 1447929366-8972-2-git-send-email-jezz@sysmic.org |
|---|---|
| State | Accepted |
| Headers | show |
Jérôme, All, On 2015-11-19 11:36 +0100, Jérôme Pouiller spake thusly: > SITE_METHOD is always set in inner-generic-package. So, it is useless > to test it in pkg-download. > > Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > package/pkg-download.mk | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/package/pkg-download.mk b/package/pkg-download.mk > index c86b9ab..757bafe 100644 > --- a/package/pkg-download.mk > +++ b/package/pkg-download.mk > @@ -222,12 +222,7 @@ define DOWNLOAD_INNER > exit 1 ; \ > fi ; \ > if test -n "$(1)" ; then \ > - if test -z "$($(PKG)_SITE_METHOD)" ; then \ > - scheme="$(call geturischeme,$(1))" ; \ > - else \ > - scheme="$($(PKG)_SITE_METHOD)" ; \ > - fi ; \ > - case "$$scheme" in \ > + case "$($(PKG)_SITE_METHOD)" in \ > git) $($(3)_GIT) && exit ;; \ > svn) $($(3)_SVN) && exit ;; \ > cvs) $($(3)_CVS) && exit ;; \ > -- > 2.1.4 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Dear Jérôme Pouiller, On Thu, 19 Nov 2015 11:36:02 +0100, Jérôme Pouiller wrote: > SITE_METHOD is always set in inner-generic-package. So, it is useless > to test it in pkg-download. > > Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> > --- > package/pkg-download.mk | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) Applied, thanks. Thomas
diff --git a/package/pkg-download.mk b/package/pkg-download.mk index c86b9ab..757bafe 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -222,12 +222,7 @@ define DOWNLOAD_INNER exit 1 ; \ fi ; \ if test -n "$(1)" ; then \ - if test -z "$($(PKG)_SITE_METHOD)" ; then \ - scheme="$(call geturischeme,$(1))" ; \ - else \ - scheme="$($(PKG)_SITE_METHOD)" ; \ - fi ; \ - case "$$scheme" in \ + case "$($(PKG)_SITE_METHOD)" in \ git) $($(3)_GIT) && exit ;; \ svn) $($(3)_SVN) && exit ;; \ cvs) $($(3)_CVS) && exit ;; \
SITE_METHOD is always set in inner-generic-package. So, it is useless to test it in pkg-download. Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> --- package/pkg-download.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)