From 69c7a945120e95b5a389c2708994e907c7ca82e0 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Fri, 12 Jul 2013 15:24:09 +0200 Subject: importpkg: simplify state logic --- importpkg.py | 7 +++---- 1 file 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) -- cgit v1.2.3