Skip to content

Commit d9179db

Browse files
committed
Fix dead code branch by checking artifact starting with cname early
1 parent bd34f4c commit d9179db

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/gardenlinux/s3/s3_artifacts.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,21 +193,21 @@ def upload_from_directory(
193193
}
194194

195195
for artifact in artifacts_dir.iterdir():
196-
if not artifact.match(f"{cname}*"):
196+
if not artifact.is_file():
197197
continue
198198

199+
if not not artifact.name.startswith(cname):
200+
raise RuntimeError(
201+
f"Artifact name '{artifact.name}' does not start with cname '{cname}'"
202+
)
203+
199204
s3_key = f"objects/{cname}/{artifact.name}"
200205

201206
with artifact.open("rb") as fp:
202207
md5sum = file_digest(fp, "md5").hexdigest()
203208
sha256sum = file_digest(fp, "sha256").hexdigest()
204209

205-
if artifact.name.startswith(cname):
206-
suffix = artifact.name[len(cname) :]
207-
else:
208-
raise RuntimeError(
209-
f"Artifact name '{artifact.name}' does not start with cname '{cname}'"
210-
)
210+
suffix = artifact.name[len(cname) :]
211211

212212
artifact_metadata = {
213213
"name": artifact.name,

0 commit comments

Comments
 (0)