diff options
author | Lars Wirzenius <liw@liw.fi> | 2021-03-17 14:16:51 +0200 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2021-03-17 14:16:51 +0200 |
commit | bc4a2f824d4338a2a65d44b035ac163c0a209106 (patch) | |
tree | c0d3e6717f96fe24ca24b856e6b3191bd4a0c1c0 | |
parent | cdaedd0a9482754a803bce6a1901c7ab8903c9df (diff) | |
download | ick-helpers-bc4a2f824d4338a2a65d44b035ac163c0a209106.tar.gz |
always require check= in run
-rw-r--r-- | ick_helpers.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ick_helpers.py b/ick_helpers.py index 74d5fb6..cbef518 100644 --- a/ick_helpers.py +++ b/ick_helpers.py @@ -35,8 +35,7 @@ class Exec: if "cwd" not in kwargs: kwargs["cwd"] = self.dirname - if "check" not in kwargs: - kwargs["check"] = True + assert "check" in kwargs kwargs["capture_output"] = True debug("RUN:", args, kwargs) @@ -107,9 +106,9 @@ class Exec: return [tag for tag in tags if self.is_release_tag(tag, project)] def create_tarball_from_tag(self, ref, filename): - self.run("git", "archive", "-o", "temp.tar", ref) - self.run("xz", "-9", "temp.tar") - self.run("mv", "temp.tar.xz", filename) + self.run("git", "archive", "-o", "temp.tar", ref, check=True) + self.run("xz", "-9", "temp.tar", check=True) + self.run("mv", "temp.tar.xz", filename, check=True) class Version: @@ -190,14 +189,15 @@ class DebianBuilderBase: "--force-distribution", msg, env=env, + check=True, ) - self.ex.run("dch", "--no-conf", "-r", "", env=env) + self.ex.run("dch", "--no-conf", "-r", "", env=env, check=True) def create_dsc(self): - self.ex.run("dpkg-buildpackage", "-S", "--no-sign", "-sa") + self.ex.run("dpkg-buildpackage", "-S", "--no-sign", "-sa", check=True) def build_deb(self): - self.ex.run("dpkg-buildpackage", "-b", "--no-sign") + self.ex.run("dpkg-buildpackage", "-b", "--no-sign", check=True) class DebianReleaseBuilder(DebianBuilderBase): @@ -236,11 +236,11 @@ class DebianReleaseBuilder(DebianBuilderBase): self.cleanup(filenames) def checkout(self, tag): - self.ex.run("git", "reset", "--hard", check=False) - self.ex.run("git", "clean", "-fdx", check=False) - self.ex.run("git", "checkout", "master", check=False) - self.ex.run("git", "branch", "-d", "__ickbuild", check=False) - self.ex.run("git", "checkout", "-b", "__ickbuild", tag) + self.ex.run("git", "reset", "--hard", check=True) + self.ex.run("git", "clean", "-fdx", check=True) + self.ex.run("git", "checkout", "master", check=True) + self.ex.run("git", "branch", "-d", "__ickbuild", check=True) + self.ex.run("git", "checkout", "-b", "__ickbuild", tag, check=True) def stash(self, *filenames): if not os.path.exists(self.results): @@ -277,7 +277,7 @@ class DebianCIBuilder(DebianBuilderBase): self.set_distribution(version, distribution) - self.ex.run("find", "-ls") + self.ex.run("find", "-ls", check=True) self.create_dsc() self.build_deb() |