Fix for neug_upgrade.py. master
authorNIIBE Yutaka <gniibe@fsij.org>
Tue, 2 Oct 2018 10:21:33 +0000 (19:21 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Tue, 2 Oct 2018 10:21:33 +0000 (19:21 +0900)
ChangeLog
tool/neug_upgrade.py

index 3644192..576fc18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2018-10-02  NIIBE Yutaka  <gniibe@fsij.org>
 
+       * tool/neug_upgrade.py (main): Apply the change of
+       gnuk/tool/upgrade_by_passwd.py for output of wait.
+
        * chopstx: Update to 1.11.
        * src/config.h.in (ACKBTN_DEFINE): New.
        * src/configure: Add ACKBTN_SUPPORT.
index 3796e44..f19bfd5 100755 (executable)
@@ -305,7 +305,7 @@ def main(wait_e, passwd, data_regnual, data_upgrade):
     #
     reg = None
     while reg == None:
-        print("Wait %d seconds..." % wait_e)
+        print("Wait {} second{}...".format(wait_e, 's' if wait_e > 1 else ''))
         time.sleep(wait_e)
         for dev in gnuk_devices_by_vidpid():
             try: