X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fcommand.py;fp=daklib%2Fcommand.py;h=88f65558c5e9659fe31da57acd4c95a4e7fa4c4b;hb=650ec31aaf1883f5f866b5245db14bdf4cf196f7;hp=a3092f6f1c72e2ef732f8270a65ef0fca8c1f3a1;hpb=69dfbae0211fa24722afc05f789d3f972fe75259;p=dak.git diff --git a/daklib/command.py b/daklib/command.py index a3092f6f..88f65558 100644 --- a/daklib/command.py +++ b/daklib/command.py @@ -62,20 +62,23 @@ class CommandFile(object): def _evaluate_sections(self, sections, session): session.rollback() try: - sections.next() - section = sections.section - - action = section.get('Action', None) - if action is None: - raise CommandError('Encountered section without Action field') - self.result.append('Action: {0}'.format(action)) - - if action == 'dm': - self.action_dm(self.fingerprint, section, session) - elif action == 'break-the-archive': - self.action_break_the_archive(self.fingerprint, section, session) - else: - raise CommandError('Unknown action: {0}'.format(action)) + while True: + sections.next() + section = sections.section + + action = section.get('Action', None) + if action is None: + raise CommandError('Encountered section without Action field') + self.result.append('Action: {0}'.format(action)) + + if action == 'dm': + self.action_dm(self.fingerprint, section, session) + elif action == 'break-the-archive': + self.action_break_the_archive(self.fingerprint, section, session) + else: + raise CommandError('Unknown action: {0}'.format(action)) + + self.result.append('') except StopIteration: pass finally: @@ -163,7 +166,6 @@ class CommandFile(object): self._notify_uploader() session.close() - self.log.log(['done', self.filename]) return result