From ad65a01073bce55948ce4b45381ee6941b5046b2 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 23 May 2016 21:03:52 +0200 Subject: remove curl dependency Teach importpkg how to download urls using urlopen and thus remove the need for invoking curl. --- autoimport.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'autoimport.py') diff --git a/autoimport.py b/autoimport.py index 132e671..abd3a5f 100755 --- a/autoimport.py +++ b/autoimport.py @@ -70,15 +70,9 @@ def process_pkg(name, pkgdict, outpath): if "sha256hash" in pkgdict: importcmd.extend(["-H", pkgdict["sha256hash"]]) if filename.startswith(("http://", "https://", "ftp://", "file://")): + importcmd.append(filename) with open(outpath, "w") as outp: - dl = subprocess.Popen(["curl", "-s", filename], - stdout=subprocess.PIPE, close_fds=True) - imp = subprocess.Popen(importcmd, stdin=dl.stdout, stdout=outp, - close_fds=True) - if imp.wait(): - raise ValueError("importpkg failed") - if dl.wait(): - raise ValueError("curl failed") + subprocess.check_call(importcmd, stdout=outp, close_fds=True) else: with open(filename) as inp: with open(outpath, "w") as outp: -- cgit v1.2.3