summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-07-02 05:49:04 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-07-02 05:49:04 +0000
commit4dec1d00e1c0cb0d15f00657991ee98ce26660c9 (patch)
tree65c292d05fe080d34481c6569ab71a872eb0c428
parentAdding upstream version 2.21.2. (diff)
downloaddevscripts-upstream.tar.xz
devscripts-upstream.zip
Adding upstream version 2.21.3.upstream/2.21.3upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--scripts/Makefile1
-rwxr-xr-xscripts/build-rdeps.pl2
-rwxr-xr-xscripts/debbisect9
-rwxr-xr-xscripts/debrebuild.pl2
-rwxr-xr-xscripts/run_bisect.sh2
-rwxr-xr-xscripts/run_bisect_qemu.sh2
6 files changed, 11 insertions, 7 deletions
diff --git a/scripts/Makefile b/scripts/Makefile
index 6412b26..bb41c31 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -156,6 +156,7 @@ install: all
install -d $(DESTDIR)$(DATA_DIR)
mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(DATA_DIR)
cp debpkg-wrapper $(DESTDIR)$(BINDIR)/debpkg
+ install -d $(DESTDIR)$(DATA_DIR)/scripts
mv $(DESTDIR)$(BINDIR)/run_bisect $(DESTDIR)$(DATA_DIR)/scripts
mv $(DESTDIR)$(BINDIR)/run_bisect_qemu $(DESTDIR)$(DATA_DIR)/scripts
diff --git a/scripts/build-rdeps.pl b/scripts/build-rdeps.pl
index 705e4cb..4052ede 100755
--- a/scripts/build-rdeps.pl
+++ b/scripts/build-rdeps.pl
@@ -2,7 +2,7 @@
# -*- tab-width: 4; indent-tabs-mode: t; cperl-indent-level: 4 -*-
# vim: set ai shiftwidth=4 tabstop=4 expandtab:
# Copyright (C) Patrick Schoenfeld
-# 2015 Johannes Schauer <josch@debian.org>
+# 2015 Johannes Schauer Marin Rodrigues <josch@debian.org>
# 2017 James McCoy <jamessan@debian.org>
#
# This program is free software; you can redistribute it and/or modify
diff --git a/scripts/debbisect b/scripts/debbisect
index 5d70343..0434e0f 100755
--- a/scripts/debbisect
+++ b/scripts/debbisect
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# Copyright 2020 Johannes 'josch' Schauer <josch@debian.org>
+# Copyright 2020 Johannes Schauer Marin Rodrigues <josch@debian.org>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -161,7 +161,6 @@ class Proxy(http.server.SimpleHTTPRequestHandler):
maxtries = 3
head, _ = os.path.split(path)
os.makedirs(head, exist_ok=True)
- self.send_response(HTTPStatus.OK)
totalsize = -1
downloaded = 0
for trynum in range(maxtries):
@@ -181,6 +180,7 @@ class Proxy(http.server.SimpleHTTPRequestHandler):
) as out:
out.seek(downloaded)
if trynum == 0:
+ self.send_response(HTTPStatus.OK)
self.send_header("Content-type", f.headers["Content-type"])
self.send_header("Content-Length", f.headers["Content-Length"])
self.send_header("Last-Modified", f.headers["Last-Modified"])
@@ -208,6 +208,9 @@ class Proxy(http.server.SimpleHTTPRequestHandler):
self.wfile.write(buf)
downloaded += chunksize
except urllib.error.HTTPError as e:
+ if e.code == 404:
+ self.send_error(404, "URLError")
+ return
logging.warning("got urllib.error.HTTPError: %s %s", repr(e), self.path)
except urllib.error.URLError as e:
logging.warning("got urllib.error.URLError: %s", repr(e))
@@ -868,7 +871,7 @@ DEBIAN_BISECT_TIMESTAMP Contains a timestamp in the format used by
DEBIAN_BISECT_EPOCH via:
date --utc --date=@$DEBIAN_BISECT_EPOCH +%Y%m%dT%H%M%SZ
-Written by Johannes 'josch' Schauer <josch@debian.org>
+Written by Johannes Schauer Marin Rodrigues <josch@debian.org>
""",
)
parser.add_argument(
diff --git a/scripts/debrebuild.pl b/scripts/debrebuild.pl
index 78c5c4b..1f0446e 100755
--- a/scripts/debrebuild.pl
+++ b/scripts/debrebuild.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#
-# Copyright © 2014-2020 Johannes Schauer <j.schauer@email.de>
+# Copyright © 2014-2020 Johannes Schauer Marin Rodrigues <josch@debian.org>
# Copyright © 2020 Niels Thykier <niels@thykier.net>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/scripts/run_bisect.sh b/scripts/run_bisect.sh
index 83b1eb4..8ac0dd2 100755
--- a/scripts/run_bisect.sh
+++ b/scripts/run_bisect.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright 2020 Johannes 'josch' Schauer <josch@debian.org>
+# Copyright 2020 Johannes Schauer Marin Rodrigues <josch@debian.org>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
diff --git a/scripts/run_bisect_qemu.sh b/scripts/run_bisect_qemu.sh
index 8376f71..04e97cf 100755
--- a/scripts/run_bisect_qemu.sh
+++ b/scripts/run_bisect_qemu.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright 2020 Johannes 'josch' Schauer <josch@debian.org>
+# Copyright 2020 Johannes Schauer Marin Rodrigues <josch@debian.org>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal