Merge lp:~gz/hydrazine/trivial_nameerror_find_status_877413 into lp:hydrazine

[Martin Packman]

Correct a mistake from the fix for bug 703057, which factored filtering of merge proposals into a separate function. There was however, a use of the `find_status` at the bottom of the main loop that I missed:

<https://code.launchpad.net/~gz/hydrazine/hide_unmerged_prerequisites_703057/+merge/78736>

While here, I also removed the if-clause as it's always true as there are no break statements for the outer `while len(all_mps):` loop and it's therefore a confusing way of spelling `if True:`.

[Jonathan Riddell (jr)]

This seems to result in it repeating the same merge proposal indefinately

review: Needs Fixing

[Martin Packman (gz)]

That's what it was doing before I believe, if you mean what's described in bug 599459 - this change shouldn't take effect till there are no merge proposals left at all.

[Jonathan Riddell (jr)]

OK, approved

review: Approve

[Martin Packman (gz)]

If you have any cunning ideas for better behaviour in the case where there are merge proposals left over, I'd be happy to tackle that bug too.

=== modified file 'feed-pqm'
--- feed-pqm	2011-10-12 22:49:12 +0000
+++ feed-pqm	2011-10-18 13:51:55 +0000
@@ -249,9 +249,8 @@
                 continue
             else:
                 print "Sorry, don't understand %r" % whatnow
-    if not len(all_mps):
-        print "No remaining merge proposals matching status %r?" % find_status
-        return 0
+    print "No remaining merge proposals ready to be merged."
+    return 0
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))