pkg-download: do not test SITE_METHOD
authorJérôme Pouiller <jezz@sysmic.org>
Thu, 19 Nov 2015 10:36:02 +0000 (11:36 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fri, 18 Dec 2015 09:08:21 +0000 (10:08 +0100)
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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/pkg-download.mk

index f08f6160999b06b651392053563927201a1fb31f..1332e66fd2faf5f08c237a167cad7d4da563d235 100644 (file)
@@ -223,12 +223,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 ;; \