Code review comment for lp:~milo/linaro-image-tools/bug1059579

Based on the fact that this was already reviewed, I'll just review the simple change in 586.

Is there any simple way you can add a test that exercises this code path? If not, land as-is, though I'd very much prefer a test.