summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2013-07-12 15:24:09 +0200
committerHelmut Grohne <helmut@subdivi.de>2013-07-12 15:24:09 +0200
commit69c7a945120e95b5a389c2708994e907c7ca82e0 (patch)
treec8524cfae75d23d3a6422856c52a0569444cb45b
parent55bf2271d7cbeeebc02e28a28ae3374aca19d339 (diff)
downloaddebian-dedup-69c7a945120e95b5a389c2708994e907c7ca82e0.tar.gz
importpkg: simplify state logic
-rwxr-xr-ximportpkg.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/importpkg.py b/importpkg.py
index 5929455..56e03ae 100755
--- a/importpkg.py
+++ b/importpkg.py
@@ -81,12 +81,11 @@ def process_package(filelike):
af = ArReader(filelike)
af.read_magic()
state = "start"
- while state not in ("finished", "skipped"):
+ while True:
try:
name = af.read_entry()
except EOFError:
- if state != "finished":
- raise ValueError("data.tar not found")
+ raise ValueError("data.tar not found")
if name == "control.tar.gz":
if state != "start":
raise ValueError("unexpected control.tar.gz")
@@ -119,8 +118,8 @@ def process_package(filelike):
print("warning: skipping filename with encoding error")
continue # skip files with non-utf8 encoding for now
yield dict(name=name, size=size, hashes=hashes)
- state = "finished"
yield "commit"
+ break
def main():
yaml.safe_dump_all(process_package(sys.stdin), sys.stdout)