try to fix ending without exit(), for usage in mpan

2 files changed, 98 insertions, 95 deletions

diff --git a/lib/isodumper.py b/lib/isodumper.py
index d153227..4cff6ce 100755
--- a/lib/isodumper.py
+++ b/lib/isodumper.py
@@ -211,7 +211,7 @@ class IsoDumper(basedialog.BaseDialog):
                 if size != 0:
                     label = str(name + ' (' + path.lstrip() + ') ' + self.sizeof_fmt(size))
                     sel = (label == selected) if selected else False
-                    self.devicelist.addItem(label, sel)                    
+                    self.devicelist.addItem(label, sel)
             return True
 
     def udev_wait(self, operation):
@@ -364,14 +364,14 @@ class IsoDumper(basedialog.BaseDialog):
     def do_format(self):
         #code, format_type, name = self.ask_format()
         if self.partition_cb.value() != "":
-            self.operation = True                      
+            self.operation = True
             format_type = list(self.format_type.keys())[list(self.format_type.values()).index(self.partition_cb.value())]
             if format_type == 'persist':
                 self.emergency(_("Persistence partition is to use when writing a Live ISO image."))
                 return
             target = self.dev.split('(')[1].split(')')[0]
             info = Info(_("Formatting confirmation in {}".format(self.partition_cb.value())), True, self.warning)
-            if self.ask_YesOrNo(info):  
+            if self.ask_YesOrNo(info):
                 name = self.partition_label.value()
                 if format_type == 'fat32':
                     name = name.upper()[:11]
@@ -756,7 +756,8 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
                 info = Info(_("Error"), True, _("There is another instance of Isodumper already running."))
                 self.ask_OK(info)
                 yui.YUILoader.deleteUI()
-                exit()
+                self._running = False
+                return
 
         # TODO Read log level from command line
         level = logging.DEBUG if debug else logging.ERROR
@@ -772,7 +773,7 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
 
         # Operation running
         self.operation = False
-        
+
         # Prepare interface on DBus
         self.bus = SystemBus()
         self.iface = self.bus.get("org.mageia.Magiback", "Isodumper")
@@ -907,7 +908,8 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
         if not self.get_devices():
             self.dialog.destroy()
             yui.YUILoader.deleteUI()
-            exit()
+            self._running = False
+            return
         # Set the initial state, active, disabled
         self.initial_state()
         self.dialog.recalcLayout()
@@ -981,7 +983,7 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
             self.write_cbox.setDisabled()
             self.write_cbox.setChecked(False)
             self.cryptcb.setChecked(False)
-            
+
         backup_ready = self.backup_cbox.isChecked() and (self.backup_dest != "")
         write_ready = self.write_cbox.isChecked() and (self.img_name != "")
         partition_ready = self.partition_cbox.isChecked() and (self.partition_cb.value() in self.format_type.values())
@@ -996,7 +998,7 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
         else:
             self.cryptcb.setDisabled()
             self.cryptkey.setDisabled()
-            
+
 
     def select_backup(self):
         if self.backup_cbox.isChecked():
@@ -1032,7 +1034,7 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
             self.cryptcb.setDisabled()
             self.cryptkey.setDisabled()
         self.interface_active_state()
-            
+
 
     def check_encryt(self):
         if self.cryptcb.isChecked():
@@ -1065,7 +1067,7 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
         if self.partition_cbox.isChecked():
             # Create a partition without writing image, will use all the device space.
             self.do_format()
-        
+
 
     def ask_format(self):
         atelier = yui.YUI.widgetFactory()
diff --git a/po/fr.po b/po/fr.po
index fb89a15..838fb8c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-13 10:24+0200\n"
+"POT-Creation-Date: 2023-01-24 23:02+0100\n"
 "PO-Revision-Date: 2021-10-14 07:01+0000\n"
 "Last-Translator: stroibe974 <sebsweb@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -136,89 +136,90 @@ msgstr "Périphérique cible : {}"
 msgid "Contains this/these partition(s)"
 msgstr "Contient cette (ces) partition(s) :"
 
-#: lib/isodumper.py:271
+#: lib/isodumper.py:270
 #, python-brace-format
 msgid "{device}: Type={type}, Label={label}"
 msgstr "{device}: Type={type}, Label={label}"
 
-#: lib/isodumper.py:276
+#. I18N: None refers to partition (no partitions on the selected device)
+#: lib/isodumper.py:275
 msgid "None"
 msgstr "Aucune"
 
 #. I18N these are units for files size
-#: lib/isodumper.py:297
+#: lib/isodumper.py:296
 msgid "B"
 msgstr "o"
 
-#: lib/isodumper.py:297
+#: lib/isodumper.py:296
 msgid "GiB"
 msgstr "Go"
 
-#: lib/isodumper.py:297
+#: lib/isodumper.py:296
 msgid "KiB"
 msgstr "Ko"
 
-#: lib/isodumper.py:297
+#: lib/isodumper.py:296
 msgid "MiB"
 msgstr "Mo"
 
-#: lib/isodumper.py:297 lib/isodumper.py:301
+#: lib/isodumper.py:296 lib/isodumper.py:300
 msgid "TiB"
 msgstr "To"
 
-#: lib/isodumper.py:305
+#: lib/isodumper.py:304
 msgid "Backup to:"
 msgstr "Sauvegarde vers :"
 
-#: lib/isodumper.py:363
+#: lib/isodumper.py:362
 msgid "Signature file {} not found\n"
 msgstr "N'a pas trouvé de fichier de signature {}\n"
 
-#: lib/isodumper.py:363
+#: lib/isodumper.py:362
 msgid "or key expired"
 msgstr "ou la clé a expiré"
 
-#: lib/isodumper.py:371
+#: lib/isodumper.py:370
 msgid "Persistence partition is to use when writing a Live ISO image."
 msgstr "Créer une image ISO Live avec une partition de persistance."
 
-#: lib/isodumper.py:374
+#: lib/isodumper.py:373
 msgid "Formatting confirmation in {}"
 msgstr "Confirmation du formatage de {}"
 
-#: lib/isodumper.py:384
+#: lib/isodumper.py:383
 msgid "The device was formatted successfully."
 msgstr "Le périphérique a été formaté avec succès."
 
-#: lib/isodumper.py:388
+#: lib/isodumper.py:387
 msgid "An error occurred while creating a partition."
 msgstr "Une erreur est survenue en créant une partition."
 
-#: lib/isodumper.py:392
+#: lib/isodumper.py:391
 msgid "Authentication error."
 msgstr "Erreur d'authentification."
 
-#: lib/isodumper.py:396
+#: lib/isodumper.py:395
 msgid "An error {} occurred."
 msgstr "Une erreur {} est survenue."
 
-#: lib/isodumper.py:414 lib/isodumper.py:871
+#: lib/isodumper.py:413 lib/isodumper.py:871
 msgid "Progress"
 msgstr "Progression"
 
-#: lib/isodumper.py:428 lib/isodumper.py:536 lib/isodumper.py:613
+#: lib/isodumper.py:427 lib/isodumper.py:535 lib/isodumper.py:612
 msgid "unmounting"
 msgstr "démonter"
 
-#: lib/isodumper.py:459
+#: lib/isodumper.py:458
 msgid "Backup confirmation"
 msgstr "Confirmation de l'écriture"
 
-#: lib/isodumper.py:459
+#: lib/isodumper.py:458
 msgid "Do you want to overwrite the file?"
 msgstr "Voulez-vous écraser le fichier existant ?"
 
-#: lib/isodumper.py:467
+#: lib/isodumper.py:466
 #, python-format
 msgid ""
 "The destination directory is too small to receive the backup (%s Mb needed)"
@@ -226,92 +227,92 @@ msgstr ""
 "Le répertoire de destination est trop petit pour recevoir la sauvegarde (%s "
 "Mo sont nécessaires)"
 
-#: lib/isodumper.py:477
+#: lib/isodumper.py:476
 msgid "Backup to: {}"
 msgstr "Sauvegarde vers : {}"
 
-#: lib/isodumper.py:490
+#: lib/isodumper.py:489
 #, python-brace-format
 msgid "{source} successfully written to {target}"
 msgstr "Image {source} écrite avec succès sur {target}"
 
-#: lib/isodumper.py:514
+#: lib/isodumper.py:513
 msgid "The device is too small to contain the ISO file."
 msgstr "Ce périphérique est trop petit pour contenir l'image ISO."
 
-#: lib/isodumper.py:519
+#: lib/isodumper.py:518
 msgid "Writing confirmation"
 msgstr "Confirmation de l'écriture"
 
-#: lib/isodumper.py:522 lib/isodumper.py:646 lib/isodumper.py:658
-#: lib/isodumper.py:946 lib/isodumper.py:956
+#: lib/isodumper.py:521 lib/isodumper.py:645 lib/isodumper.py:657
+#: lib/isodumper.py:947 lib/isodumper.py:957
 msgid "Warning"
 msgstr "Avertissement"
 
-#: lib/isodumper.py:523
+#: lib/isodumper.py:522
 msgid "The device is bigger than 32 Gbytes. Are you sure you want use it?"
 msgstr ""
 "La taille de ce périphérique dépasse 32 Go. Êtes-vous sûr·e de vouloir "
 "l'utiliser ?"
 
-#: lib/isodumper.py:529
+#: lib/isodumper.py:528
 #, python-brace-format
 msgid "Writing {source} to {target}"
 msgstr "Écriture de {source} vers {target}"
 
-#: lib/isodumper.py:531
+#: lib/isodumper.py:530
 #, python-brace-format
 msgid "Executing copy from {source} to {target}"
 msgstr "Copie de {source} vers {target}"
 
-#: lib/isodumper.py:549
+#: lib/isodumper.py:548
 #, python-brace-format
 msgid "Image {source} written to {target}"
 msgstr "Image {source} écrite vers {target}"
 
-#: lib/isodumper.py:551
+#: lib/isodumper.py:550
 msgid "Bytes written: {}"
 msgstr "Octets écrits : {}"
 
-#: lib/isodumper.py:554
+#: lib/isodumper.py:553
 msgid "Checking "
 msgstr "Vérification :"
 
-#: lib/isodumper.py:571
+#: lib/isodumper.py:570
 msgid "Adding persistent partition"
 msgstr "Ajout d'une partition de persistance"
 
-#: lib/isodumper.py:575
+#: lib/isodumper.py:574
 msgid "No key for encrypted partition provided. Adding the partition aborted."
 msgstr ""
 "Aucune clé n'a été fournie pour la partition chiffrée. Création de la "
 "partition annulée."
 
-#: lib/isodumper.py:587
+#: lib/isodumper.py:586
 msgid "Added encrypted persistent partition"
 msgstr "Partition de persistance chiffrée ajoutée"
 
-#: lib/isodumper.py:591
+#: lib/isodumper.py:590
 msgid "Adding encrypted persistent partition failed"
 msgstr "Échec de l'ajout d'une partition de persistance chiffrée"
 
-#: lib/isodumper.py:602
+#: lib/isodumper.py:601
 msgid "Added persistent partition"
 msgstr "Partition de persistance ajoutée"
 
-#: lib/isodumper.py:604
+#: lib/isodumper.py:603
 msgid "Adding persistent partition failed"
 msgstr "Échec de l'ajout d'une partition de persistance"
 
-#: lib/isodumper.py:636
+#: lib/isodumper.py:635
 msgid "Success"
 msgstr "Succès"
 
-#: lib/isodumper.py:636
+#: lib/isodumper.py:635
 msgid "The operation completed successfully."
 msgstr "L'opération s'est terminée avec succès."
 
-#: lib/isodumper.py:637 lib/isodumper.py:648
+#: lib/isodumper.py:636 lib/isodumper.py:647
 msgid ""
 "You are free to unplug it now, a logfile \n"
 "/home/-user-/.isodumper/isodumper.log has been saved."
@@ -320,11 +321,11 @@ msgstr ""
 "un fichier de journalisation /home/-user-/.isodumper/isodumper.log a été "
 "enregistré."
 
-#: lib/isodumper.py:639 lib/isodumper.py:650
+#: lib/isodumper.py:638 lib/isodumper.py:649
 msgid "You may also consult /var/log/magiback.log"
 msgstr "Vous pouvez aussi consulter /var/log/magiback.log"
 
-#: lib/isodumper.py:646
+#: lib/isodumper.py:645
 msgid ""
 "The operation completed, but with anomalies.\n"
 " Check carefully the messages in log view"
@@ -332,7 +333,7 @@ msgstr ""
 "L'opération est terminée, mais comporte des erreurs.\n"
 "Veuillez lire attentivement les messages dans le journal de bord."
 
-#: lib/isodumper.py:658
+#: lib/isodumper.py:657
 msgid ""
 "Writing is in progress. Exiting during writing \n"
 "            will make the device or the backup unusable.\n"
@@ -342,24 +343,24 @@ msgstr ""
 "inutilisable.\n"
 "Êtes-vous sûr de vouloir quitter le programme en cours d'écriture ?"
 
-#: lib/isodumper.py:670 lib/isodumper.py:757 lib/isodumper.py:1055
-#: lib/isodumper.py:1063
+#: lib/isodumper.py:669 lib/isodumper.py:756 lib/isodumper.py:1056
+#: lib/isodumper.py:1064
 msgid "Error"
 msgstr "Erreur"
 
-#: lib/isodumper.py:705
+#: lib/isodumper.py:704
 msgid "ISO Image to copy: "
 msgstr "Image ISO à copier :"
 
-#: lib/isodumper.py:712
+#: lib/isodumper.py:711
 msgid "IsoDumper"
 msgstr "IsoDumper"
 
-#: lib/isodumper.py:712
+#: lib/isodumper.py:711
 msgid "Mageia IsoDumper"
 msgstr "Mageia IsoDumper"
 
-#: lib/isodumper.py:714
+#: lib/isodumper.py:713
 msgid ""
 "This GUI program is primarily for safely writing a bootable ISO image to a "
 "USB flash drive, an operation devious & potentially hazardous when done by "
@@ -373,11 +374,11 @@ msgstr ""
 "sauvegarder sur disque dur la totalité du contenu initial de la clé, et par "
 "conséquent rétablir ladite clé dans son état d'origine."
 
-#: lib/isodumper.py:718
+#: lib/isodumper.py:717
 msgid "It gives also a feature for formatting the USB device."
 msgstr "Il offre la possibilité de formater un périphérique USB."
 
-#: lib/isodumper.py:720
+#: lib/isodumper.py:719
 msgid ""
 "IsoDumper can be launched either from the menus, or a user console with the "
 "command 'isodumper'."
@@ -385,7 +386,7 @@ msgstr ""
 "IsoDumper peut être lancé soit à partir du menu, soit à partir d'une console "
 "en tant qu'utilisateur avec la commande « isodumper »."
 
-#: lib/isodumper.py:722
+#: lib/isodumper.py:721
 msgid ""
 "The root password is solicited when this is necessary for the program's "
 "operation."
@@ -393,7 +394,7 @@ msgstr ""
 "Le mot de passe Administrateur sera demandé lorsque nécessaire pour "
 "l'exécution du programme."
 
-#: lib/isodumper.py:723
+#: lib/isodumper.py:722
 msgid ""
 "The flash drive can be inserted beforehand or once the program is started. "
 "In the latter case, a dialogue will say that there is no flash drive "
@@ -406,7 +407,7 @@ msgstr ""
 "devrez peut-être fermer une fenêtre automatiquement ouverte par votre "
 "gestionnaire de fichiers.)"
 
-#: lib/isodumper.py:726
+#: lib/isodumper.py:725
 msgid ""
 "The fields of the main window are as follows:<BR />- Device to work on: the "
 "device of the USB flash drive, a drop-down list to choose from.<BR />- Write "
@@ -420,7 +421,7 @@ msgstr ""
 "img de sauvegarde du périphérique).<BR />- Écrire sur le périphérique : ce "
 "bouton lance l'opération, précédée d'un message d'avertissement."
 
-#: lib/isodumper.py:731
+#: lib/isodumper.py:730
 msgid ""
 "- Add a persistent partition: the remaining space will be used in a new "
 "partition where data from the Live system can be written and recovered "
@@ -430,7 +431,7 @@ msgstr ""
 "nouvelle partition dans laquelle les données du système Live pourront être "
 "écrites et récupérées d'une session à l'autre."
 
-#: lib/isodumper.py:733
+#: lib/isodumper.py:732
 msgid ""
 "- Encrypt: the persistent partition will be encrypted with the key provided "
 "in <i>Key</i> field."
@@ -438,12 +439,12 @@ msgstr ""
 "- Crypter : la partition persistante sera cryptée avec la clé fournie dans "
 "le champ <i>Clé</i>."
 
-#: lib/isodumper.py:734
+#: lib/isodumper.py:733
 msgid "The operation is shown in the progress bar beneath."
 msgstr ""
 "L'avancée de la tâche est visible dans la barre de progression ci-dessous."
 
-#: lib/isodumper.py:735
+#: lib/isodumper.py:734
 msgid ""
 "- Backup to: define the name and placement of the backup image file. The "
 "current flash drive will be backed up to a disc file. Note that the entire "
@@ -460,11 +461,11 @@ msgstr ""
 "USB). Ce fichier de sauvegarde peut être utilisé ultérieurement pour "
 "restaurer le lecteur flash en sélectionnant le fichier source *.img à écrire."
 
-#: lib/isodumper.py:739
+#: lib/isodumper.py:738
 msgid "- Backup the device: launch the backup operation."
 msgstr "- Sauvegarde du périphérique : lancer la sauvegarde."
 
-#: lib/isodumper.py:740
+#: lib/isodumper.py:739
 msgid ""
 "- Format the device: create an unique partition on the entire volume in the "
 "specified format in FAT, exFAT, NTFS or ext. You can specify a volume name "
@@ -474,7 +475,7 @@ msgstr ""
 "dans le format spécifié en FAT, exFAT, NTFS ou ext. Vous pourrez indiquer un "
 "nom de volume et le format dans une nouvelle boîte de dialogue."
 
-#: lib/isodumper.py:757
+#: lib/isodumper.py:756
 msgid "There is another instance of Isodumper already running."
 msgstr "Une autre instance d’Isodumper est déjà en cours."
 
@@ -570,7 +571,7 @@ msgid "When you are sure all options are correct, start:"
 msgstr ""
 "Quand vous êtes sûr·e que toutes les options sont correctes, démarrez :"
 
-#: lib/isodumper.py:868 lib/isodumper.py:1087
+#: lib/isodumper.py:868 lib/isodumper.py:1088
 msgid "Execute"
 msgstr "Exécuter"
 
@@ -594,19 +595,19 @@ msgstr "Quitter"
 msgid "UDisks2 is not available on your system"
 msgstr "UDisks2 n'est pas disponible dans votre système"
 
-#: lib/isodumper.py:947
+#: lib/isodumper.py:948
 msgid "Do you want to continue?"
 msgstr "Voulez-vous continuer ?"
 
-#: lib/isodumper.py:947
+#: lib/isodumper.py:948
 msgid "The validation of the GPG signature of the checksum file failed !"
 msgstr "La validation par la signature GPG de la somme de contrôle a échoué !"
 
-#: lib/isodumper.py:954
+#: lib/isodumper.py:955
 msgid "The checksum file is signed"
 msgstr "La somme de contrôle est signée"
 
-#: lib/isodumper.py:957
+#: lib/isodumper.py:958
 msgid ""
 "No GPG signature has been found or the key is expired. Are you sure you want "
 "to use this image?"
@@ -614,59 +615,59 @@ msgstr ""
 "Aucune signature GPG n'a été trouvée, ou la clé a expiré. Êtes-vous sûr·e de "
 "vouloir utiliser cette image ?"
 
-#: lib/isodumper.py:1055
+#: lib/isodumper.py:1056
 msgid "No image for backup is selected."
 msgstr "Aucune image de sauvegarde n'est sélectionnée."
 
-#: lib/isodumper.py:1063
+#: lib/isodumper.py:1064
 msgid "No image to write is selected."
 msgstr "Aucune image à écrire n'est sélectionnée."
 
-#: lib/isodumper.py:1075
+#: lib/isodumper.py:1076
 msgid "Label for the device:"
 msgstr "Nom du volume :"
 
-#: lib/isodumper.py:1079
+#: lib/isodumper.py:1080
 msgid "FAT32 (Windows)"
 msgstr "FAT32 (Windows)"
 
-#: lib/isodumper.py:1081
+#: lib/isodumper.py:1082
 msgid "exFAT (Windows)"
 msgstr "exFAT (Windows)"
 
-#: lib/isodumper.py:1083
+#: lib/isodumper.py:1084
 msgid "NTFS (Windows)"
 msgstr "NTFS (Windows)"
 
-#: lib/isodumper.py:1085
+#: lib/isodumper.py:1086
 msgid "ext4 (Linux)"
 msgstr "ext4 (Linux)"
 
-#: lib/isodumper.py:1088 lib/isodumper.py:1159
+#: lib/isodumper.py:1089 lib/isodumper.py:1160
 msgid "Cancel"
 msgstr "Annuler"
 
-#: lib/isodumper.py:1128
+#: lib/isodumper.py:1129
 msgid "OK"
 msgstr "OK"
 
-#: lib/isodumper.py:1138
+#: lib/isodumper.py:1139
 msgid "Yes"
 msgstr "Oui"
 
-#: lib/isodumper.py:1139
+#: lib/isodumper.py:1140
 msgid "No"
 msgstr "Non"
 
-#: lib/isodumper.py:1147
+#: lib/isodumper.py:1148
 msgid "Oliver Grawert<BR />Papoteur<BR />Pictures : Timothée Giet"
 msgstr "Oliver Grawert<BR />Papoteur<BR />Images : Timothée Giet"
 
-#: lib/isodumper.py:1148
+#: lib/isodumper.py:1149
 msgid "A tool for writing ISO images to  a device"
 msgstr "Un outil pour écrire des images ISO sur une clé USB"
 
-#: lib/isodumper.py:1157
+#: lib/isodumper.py:1158
 msgid ""
 "Warning\n"
 "No target devices were found.\n"
@@ -677,11 +678,11 @@ msgstr ""
 " Vous devez brancher une clé USB\n"
 " sur laquelle l'image pourra être écrite."
 
-#: lib/isodumper.py:1158
+#: lib/isodumper.py:1159
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: lib/isodumper.py:1201
+#: lib/isodumper.py:1202
 msgid "allow debug information"
 msgstr "autoriser les informations de débogage"