forgot vars, duplicate, underping all around

motoflash2sh.py

@@ -67,11 +67,11 @@ def main():
         assert step.tag == 'step'
         op = step.get('operation')
         if op=='flash':
-            vars = 'partition', 'filename',
+            vars = 'operation', 'partition', 'filename',
         elif op=='erase':
-            vars = 'partition',
+            vars = 'operation', 'partition',
         elif op in ('getvar','oem'):
-            vars = 'operation',
+            vars = 'operation', 'var'
         else:
             args.output.write('\n# %02d: skipping unknown operation %r:\n%s\n\n' % (nn, op, commentify(step)))
             op = None
@@ -84,8 +84,5 @@ def main():
     print("Wrote shell script with %d fastboot steps to %s" % (len(steps), args.output.name),
           file=sys.stderr)
 
-    print("Wrote shell script with %d fastboot steps to %s" % (len(steps), args.output.name),
-          file=sys.stderr)
-
 if __name__=='__main__':
     sys.exit( main() )