Skip to content

Commit 7d094d7

Browse files
committed
[dorelease] Minor code quality improvements
- Import order fixes. - Check size string before trying to parse. - Docker cleanup unnecessary: We run the container with --rm.
1 parent 1df6557 commit 7d094d7

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

dorelease

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import re
1919
from glob import glob
2020
from subprocess import check_output, call, DEVNULL
2121
from tempfile import TemporaryDirectory
22-
import requests
2322
import plistlib
23+
import requests
2424
from requests.exceptions import ConnectionError as ConnError
2525

2626
DESTDIR = "dist"
@@ -71,8 +71,10 @@ def download(url, fname=None):
7171
except ConnError:
7272
print(f"Error while trying to download {url}", file=sys.stderr)
7373
print("Skipping.", file=sys.stderr)
74-
return
75-
size = int(req.headers.get("content-length"))
74+
return None
75+
size = 0
76+
if sizestr := req.headers.get("content-length"):
77+
size = int(sizestr)
7678
etag = req.headers.get("etag")
7779
oldet = ETAGS.get(url)
7880
if etag == oldet and os.path.exists(fname):
@@ -215,15 +217,6 @@ def debianize(binfile, annexsa_archive):
215217
"""
216218
For each Linux binary make a deb package with git annex standalone.
217219
"""
218-
def docker_cleanup():
219-
print("Stopping and cleaning up docker container")
220-
cmd = ["docker", "kill", "gin-deb-build"]
221-
run(cmd)
222-
cmd = ["docker", "container", "rm", "gin-deb-build"]
223-
run(cmd)
224-
225-
docker_cleanup()
226-
227220
# The default temporary root on macOS is /var/folders
228221
# Docker currently has issues mounting directories under /var
229222
# Forcing temporary directory to be rooted at /tmp instead
@@ -316,7 +309,6 @@ def debianize(binfile, annexsa_archive):
316309
print("Running debian build script")
317310
if run(cmd) > 0:
318311
print("Deb build failed", file=sys.stderr)
319-
docker_cleanup()
320312
return
321313

322314
debfilename = f"{pkgname}.deb"
@@ -326,7 +318,6 @@ def debianize(binfile, annexsa_archive):
326318
os.remove(debfiledest)
327319
shutil.copy(debfilepath, debfiledest)
328320
print("Done")
329-
docker_cleanup()
330321
return debfiledest
331322

332323

0 commit comments

Comments
 (0)