From 14c706723252b9c19d72693b7bc9c054c9f148d0 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Thu, 15 Aug 2019 19:11:29 +0300 Subject: Update Ukrainian translation --- po/uk.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/uk.po b/po/uk.po index 8cf9fcb..eacfca5 100644 --- a/po/uk.po +++ b/po/uk.po @@ -10,16 +10,16 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-15 17:59+0200\n" -"PO-Revision-Date: 2019-01-29 09:17+0200\n" +"PO-Revision-Date: 2019-08-15 19:10+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 2.0\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<" +"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Lokalize 19.11.70\n" #: backend/raw_write.py:49 backend/raw_write.py:78 msgid "Reading error." @@ -109,23 +109,23 @@ msgstr "Пристрій призначення: " #. I18N these are units for files size #: lib/isodumper.py:174 msgid "B" -msgstr "" +msgstr "Б" #: lib/isodumper.py:174 msgid "GiB" -msgstr "" +msgstr "ГіБ" #: lib/isodumper.py:174 msgid "KiB" -msgstr "" +msgstr "КіБ" #: lib/isodumper.py:174 msgid "MiB" -msgstr "" +msgstr "МіБ" #: lib/isodumper.py:174 lib/isodumper.py:178 msgid "TiB" -msgstr "" +msgstr "ТіБ" #: lib/isodumper.py:192 msgid "Formatting confirmation" -- cgit v1.2.1 From 04409e2318de2d9b6d090570b025bdd227ca25a7 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Thu, 15 Aug 2019 19:31:53 +0300 Subject: Update Slovenian translation from Tx --- po/sl.po | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/po/sl.po b/po/sl.po index cfb09b0..54dbcfc 100644 --- a/po/sl.po +++ b/po/sl.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-15 17:59+0200\n" -"PO-Revision-Date: 2019-07-29 09:44+0000\n" +"PO-Revision-Date: 2019-08-15 16:25+0000\n" "Last-Translator: Filip Komar \n" "Language-Team: Slovenian (http://www.transifex.com/MageiaLinux/mageia/" "language/sl/)\n" @@ -112,23 +112,23 @@ msgstr "Ciljna naprava: " #. I18N these are units for files size #: lib/isodumper.py:174 msgid "B" -msgstr "" +msgstr "B" #: lib/isodumper.py:174 msgid "GiB" -msgstr "" +msgstr "GiB" #: lib/isodumper.py:174 msgid "KiB" -msgstr "" +msgstr "KiB" #: lib/isodumper.py:174 msgid "MiB" -msgstr "" +msgstr "MiB" #: lib/isodumper.py:174 lib/isodumper.py:178 msgid "TiB" -msgstr "" +msgstr "TiB" #: lib/isodumper.py:192 msgid "Formatting confirmation" @@ -470,6 +470,3 @@ msgid "A GUI tool to write .img and .iso files to USB sticks" msgstr "" "Orodje z grafičnim uporabniškim vmesnikom za zapis datotek odtisa diska " "npr.: .img in .iso na ključek USB" - -#~ msgid "Mb" -#~ msgstr "Mb" -- cgit v1.2.1 From 6058bb7b64ad24e5ffefc336812d120948dbdcd2 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Fri, 16 Aug 2019 08:21:14 +0300 Subject: Update Estonian translation from Tx --- po/et.po | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/po/et.po b/po/et.po index d511bec..5583144 100644 --- a/po/et.po +++ b/po/et.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-15 17:59+0200\n" -"PO-Revision-Date: 2019-07-28 19:33+0000\n" +"PO-Revision-Date: 2019-08-15 18:19+0000\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian (http://www.transifex.com/MageiaLinux/mageia/" "language/et/)\n" @@ -111,23 +111,23 @@ msgstr "Sihtseade: " #. I18N these are units for files size #: lib/isodumper.py:174 msgid "B" -msgstr "" +msgstr "B" #: lib/isodumper.py:174 msgid "GiB" -msgstr "" +msgstr "GiB" #: lib/isodumper.py:174 msgid "KiB" -msgstr "" +msgstr "KiB" #: lib/isodumper.py:174 msgid "MiB" -msgstr "" +msgstr "MiB" #: lib/isodumper.py:174 lib/isodumper.py:178 msgid "TiB" -msgstr "" +msgstr "TiB" #: lib/isodumper.py:192 msgid "Formatting confirmation" @@ -468,6 +468,3 @@ msgstr "Rakendus USB-pulkade vormindamiseks" #: share/applications/isodumper.desktop.in.h:1 msgid "A GUI tool to write .img and .iso files to USB sticks" msgstr "Rakendus .img- ja .iso-failide kirjutamiseks USB-pulgale" - -#~ msgid "Mb" -#~ msgstr "Mb" -- cgit v1.2.1 From a00d31c5f09b9c21ff94b5f5968605d0998c808b Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Fri, 16 Aug 2019 08:21:41 +0300 Subject: Update German translation from Tx --- po/de.po | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/po/de.po b/po/de.po index f35be50..30020f1 100644 --- a/po/de.po +++ b/po/de.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-15 17:59+0200\n" -"PO-Revision-Date: 2019-01-29 09:11+0000\n" +"PO-Revision-Date: 2019-08-15 21:05+0000\n" "Last-Translator: psyca\n" "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/" "de/)\n" @@ -122,23 +122,23 @@ msgstr "Zielgerät: " #. I18N these are units for files size #: lib/isodumper.py:174 msgid "B" -msgstr "" +msgstr "B" #: lib/isodumper.py:174 msgid "GiB" -msgstr "" +msgstr "GiB" #: lib/isodumper.py:174 msgid "KiB" -msgstr "" +msgstr "KiB" #: lib/isodumper.py:174 msgid "MiB" -msgstr "" +msgstr "MiB" #: lib/isodumper.py:174 lib/isodumper.py:178 msgid "TiB" -msgstr "" +msgstr "TiB" #: lib/isodumper.py:192 msgid "Formatting confirmation" @@ -347,7 +347,7 @@ msgstr "" #: lib/isodumper.py:476 msgid "There is another instance of Isodumper already running." -msgstr "" +msgstr "Es wir bereits eine Instanz von Isodumper ausgeführt." #: lib/isodumper.py:490 msgid "Choose an image" @@ -496,6 +496,3 @@ msgid "A GUI tool to write .img and .iso files to USB sticks" msgstr "" "Eine graphische Oberfläche, um .img oder .iso Abbilder auf USB-Sticks zu " "schreiben" - -#~ msgid "Mb" -#~ msgstr "Mb" -- cgit v1.2.1 From 105f0bfb3d3fbbf66ca3969a7a7ab8b83c924292 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Fri, 16 Aug 2019 09:46:37 +0300 Subject: Update Greek translation from Tx --- po/el.po | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/po/el.po b/po/el.po index 3b23e9c..206d23a 100644 --- a/po/el.po +++ b/po/el.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-15 17:59+0200\n" -"PO-Revision-Date: 2019-07-30 04:28+0000\n" +"PO-Revision-Date: 2019-08-16 04:16+0000\n" "Last-Translator: Dimitrios Glentadakis \n" "Language-Team: Greek (http://www.transifex.com/MageiaLinux/mageia/language/" "el/)\n" @@ -115,23 +115,23 @@ msgstr "Συσκευή προορισμού: " #. I18N these are units for files size #: lib/isodumper.py:174 msgid "B" -msgstr "" +msgstr "B" #: lib/isodumper.py:174 msgid "GiB" -msgstr "" +msgstr "GiB" #: lib/isodumper.py:174 msgid "KiB" -msgstr "" +msgstr "KiB" #: lib/isodumper.py:174 msgid "MiB" -msgstr "" +msgstr "MiB" #: lib/isodumper.py:174 lib/isodumper.py:178 msgid "TiB" -msgstr "" +msgstr "TiB" #: lib/isodumper.py:192 msgid "Formatting confirmation" @@ -484,6 +484,3 @@ msgstr "Ένα γραφικό εργαλείο για την μορφοποίη msgid "A GUI tool to write .img and .iso files to USB sticks" msgstr "" "Ένα γραφικό εργαλείο για την εγγραφή αρχείων .img και .iso σε κλειδιά USB" - -#~ msgid "Mb" -#~ msgstr "Mb" -- cgit v1.2.1 From 2efcaa7e8f5c79af6dee27374ef33a4bcb109cc9 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Fri, 16 Aug 2019 09:47:01 +0300 Subject: Update Russian translation from Tx --- po/ru.po | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/po/ru.po b/po/ru.po index 0fcc7b2..286153a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-15 17:59+0200\n" -"PO-Revision-Date: 2019-07-28 23:17+0000\n" +"PO-Revision-Date: 2019-08-15 23:59+0000\n" "Last-Translator: AlexL \n" "Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/" "ru/)\n" @@ -116,23 +116,23 @@ msgstr "Целевое устройство: " #. I18N these are units for files size #: lib/isodumper.py:174 msgid "B" -msgstr "" +msgstr "Б" #: lib/isodumper.py:174 msgid "GiB" -msgstr "" +msgstr "ГиБ" #: lib/isodumper.py:174 msgid "KiB" -msgstr "" +msgstr "КиБ" #: lib/isodumper.py:174 msgid "MiB" -msgstr "" +msgstr "МиБ" #: lib/isodumper.py:174 lib/isodumper.py:178 msgid "TiB" -msgstr "" +msgstr "ТиБ" #: lib/isodumper.py:192 msgid "Formatting confirmation" @@ -494,6 +494,3 @@ msgstr "Программа с графическим интерфейсом дл #: share/applications/isodumper.desktop.in.h:1 msgid "A GUI tool to write .img and .iso files to USB sticks" msgstr "Графическая утилита для записи .img и .iso файлов на USB флешки" - -#~ msgid "Mb" -#~ msgstr "МБ" -- cgit v1.2.1 From ff1a9420bd40c02ae31afbe17163376b4fd8fff1 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 19 Aug 2019 08:40:58 +0300 Subject: Update Turkish translation from Tx --- po/tr.po | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/po/tr.po b/po/tr.po index 33b412b..54d805a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-15 17:59+0200\n" -"PO-Revision-Date: 2019-03-12 14:25+0000\n" +"PO-Revision-Date: 2019-08-18 18:19+0000\n" "Last-Translator: Muha Aliss \n" "Language-Team: Turkish (http://www.transifex.com/MageiaLinux/mageia/language/" "tr/)\n" @@ -114,23 +114,23 @@ msgstr "Hedef Aygıt: " #. I18N these are units for files size #: lib/isodumper.py:174 msgid "B" -msgstr "" +msgstr "B" #: lib/isodumper.py:174 msgid "GiB" -msgstr "" +msgstr "GiB" #: lib/isodumper.py:174 msgid "KiB" -msgstr "" +msgstr "KiB" #: lib/isodumper.py:174 msgid "MiB" -msgstr "" +msgstr "MiB" #: lib/isodumper.py:174 lib/isodumper.py:178 msgid "TiB" -msgstr "" +msgstr "TiB" #: lib/isodumper.py:192 msgid "Formatting confirmation" @@ -325,7 +325,7 @@ msgstr "" #: lib/isodumper.py:476 msgid "There is another instance of Isodumper already running." -msgstr "" +msgstr "Çalışmakta olan başka bir Isodumper isteği var." #: lib/isodumper.py:490 msgid "Choose an image" @@ -470,6 +470,3 @@ msgstr "USB bellekleri biçimlendirmek için grafiksel bir araç" msgid "A GUI tool to write .img and .iso files to USB sticks" msgstr "" "USB belleklere .img ve .iso dosyalarını yazdırmak için bir grafiksel araç" - -#~ msgid "Mb" -#~ msgstr "Mb" -- cgit v1.2.1 From b143313b9bd707e9dd7279dff42acd687514824f Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 19 Aug 2019 20:20:56 +0300 Subject: Update Catalan translation from Tx --- po/ca.po | 65 ++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/po/ca.po b/po/ca.po index f1f6ce3..d3e79b6 100644 --- a/po/ca.po +++ b/po/ca.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-15 17:59+0200\n" -"PO-Revision-Date: 2019-07-30 18:45+0000\n" +"PO-Revision-Date: 2019-08-19 12:54+0000\n" "Last-Translator: Davidmp \n" "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/" "ca/)\n" @@ -115,23 +115,23 @@ msgstr "Dispositiu de destinació: " #. I18N these are units for files size #: lib/isodumper.py:174 msgid "B" -msgstr "" +msgstr "B" #: lib/isodumper.py:174 msgid "GiB" -msgstr "" +msgstr "GiB" #: lib/isodumper.py:174 msgid "KiB" -msgstr "" +msgstr "KiB" #: lib/isodumper.py:174 msgid "MiB" -msgstr "" +msgstr "MiB" #: lib/isodumper.py:174 lib/isodumper.py:178 msgid "TiB" -msgstr "" +msgstr "TiB" #: lib/isodumper.py:192 msgid "Formatting confirmation" @@ -303,33 +303,31 @@ msgstr "" "pot fer una còpia de seguretat completa del contingut previ
de la " "memòria extraïble al disc dur i restaurar la memòria a l'estat anterior " "després.
També inclou la possibilitat de formatar el dispositiu USB. " -"
L'IsoDumper es pot iniciar o bé des dels menús, o bé des d'una consola " -"d'usuari o d'arrel amb l'ordre \"isodumper\".
Per als usuaris normals, " -"es demana la contrasenya d'administrador, necessària per a l'operació del " -"programa.
La memòria extraïble es pot inserir abans o un cop s'ha " -"iniciat el programa. En l'últim cas, hi haurà un diàleg que dirà que no hi " -"ha cap memòria inserida, però que permet un \"reintent\" per trobar-la un " -"cop hi és.
(Pot ser que hàgiu de tancar una finestra del gestor de " +"

L'IsoDumper es pot iniciar o bé des dels menús, o bé des d'una " +"consola d'usuari o d'arrel amb l'ordre \"isodumper\".
Per als usuaris " +"normals, es demana la contrasenya d'administrador, necessària per a " +"l'operació del programa.
La memòria extraïble es pot inserir abans o un " +"cop s'ha iniciat el programa. En l'últim cas, hi haurà un diàleg que dirà " +"que no hi ha cap memòria inserida, però que permet un reintent per trobar-la " +"un cop hi és.
(Pot ser que hàgiu de tancar una finestra del gestor de " "fitxers que s'hagi obert automàticament).

Els camps de la " -"finestra principal són els següents:
- Dispositiu de treball: el " -"dispositiu de la memòria USB, un menú desplegable per escollir-lo.
- " -"Escriu la imatge: per escollir la imatge ISO d'origen (*.iso) (o fitxer de " -"còpia de seguretat *.img) per passar.
- Escriu al dispositiu: per " -"iniciar l'operació - amb un diàleg d'avís previ. Si es demana una còpia de " -"seguretat de memòria extraïble, això és primer. Llavors es fa l'escriptura. " -"Cada operació es mostra a la barra de progrés de sota.
- Fes una còpia " -"de seguretat del dispositiu: defineix el nom i la ubicació del fitxer " -"d'imatge de còpia de seguretat. Es farà una còpia de seguretat del " -"dispositiu extraïble actual a un fitxer del disc. Recordeu que tota la " -"unitat flaix es conserva, independentment del seu contingut real; per tant, " -"assegureu-vos que teniu l'espai lliure suficient al disc (el mateix espai " -"que el del dispositiu USB). Aquest fitxer es pot utilitzar després per " -"restaurar el dispositiu extraïble seleccionant-lo com a fitxer d'origen (*." -"img) per escriure'l.
- Fes la còpia de seguretat del dispositiu: " -"inicia l'operació de còpia de seguretat.
- Formata el dispositiu: " -"crea una partició única a tot el volum especificat amb el format FAT, NTFS o " -"ext. Podeu especificar el nom del volum i el format en un altre diàleg.
- Detalls: mostra la informació més detallada." +"finestra principal són els següents:
- Dispositiu de treball: el " +"dispositiu de la memòria USB, un menú desplegable per escollir-lo.
- " +"Escriu la imatge: per triar la imatge ISO d'origen (*.iso) (o fitxer de " +"còpia de seguretat *.img) per passar.
- Escriu al dispositiu: aquest " +"botó inicia l'operació - amb un diàleg d'avís previ.
L'operació es " +"mostra a la barra de progrés de sota.
- Fes una còpia de seguretat a: " +"es defineix el nom i el lloc del fitxer d'imatge de còpia de seguretat. La " +"memòria extraïble es copiarà en un fitxer dels disc. Tingueu en compte que " +"es preserva la memòria extraïble sencera, sense tenir-ne en compte el " +"contingut. Assegureu-vos que tingueu l'espai de disc necessari (el mateix " +"espai que el dispositiu USB). Aquesta imatge de còpia de seguretat es pot " +"usar després per restaurar la memòria extraïble seleccionant-la com a fitxer " +"d'origen (*.img) per escriure-la.
- Fes una còpia de seguretat del " +"dispositiu: s'inicia l'operació de còpia de seguretat.
- Formata el " +"dispositiu: crea una partició única a tot el volum especificat amb el format " +"FAT, NTFS o ext. Podeu especificar el nom del volum i el format en un altre " +"diàleg.
" #: lib/isodumper.py:476 msgid "There is another instance of Isodumper already running." @@ -479,6 +477,3 @@ msgstr "Una eina gràfica per formatar memòries USB" #: share/applications/isodumper.desktop.in.h:1 msgid "A GUI tool to write .img and .iso files to USB sticks" msgstr "Una eina gràfica per passar fitxers .img i .iso a memòries USB" - -#~ msgid "Mb" -#~ msgstr "MB" -- cgit v1.2.1 From 2438cc815b17cd94fab39d60606441698fb0b439 Mon Sep 17 00:00:00 2001 From: Papoteur Date: Sun, 18 Aug 2019 07:44:57 +0200 Subject: Cleaning --- CHANGELOG | 5 +++++ Makefile | 2 +- lib/isodumper.py | 18 ------------------ tools/po-update.sh | 2 +- 4 files changed, 7 insertions(+), 20 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4c1525e..daf92dc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,10 @@ The modifications are: +IsoDumper 1.14 +-------------- + - Rework udisks2 information usage to be more reliable + - Update Serbian and Catalan translations + IsoDumper 1.13 -------------- - Fix self detection in processes diff --git a/Makefile b/Makefile index 6f91708..00d419c 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ DBUSDIR=$(SYSCONFDIR)/dbus-1 SYSTEMDCONFDIR=$(LIBDIR)/systemd/system/ PACKAGE = isodumper -VERSION = 1.13 +VERSION = 1.14 GITPATH = git://git.mageia.org/software/isodumper all: dirs pofiles diff --git a/lib/isodumper.py b/lib/isodumper.py index f044191..6e036ac 100755 --- a/lib/isodumper.py +++ b/lib/isodumper.py @@ -99,24 +99,6 @@ class UDisks2(object): item.append(path) item.append(size) list.append(item) - #for dev in devs: - #dev_obj =objects[dev['path']][self.DRIVE] - #if (dev_obj['ConnectionBus'] == 'usb' or dev_obj['ConnectionBus'] == 'sdio') and \ - #(dev_obj['Removable'] == 1 or dev_obj['MediaRemovable'] == 1 ): - #item=[] - #vend = dev_obj['Vendor'] - #name = dev_obj['Model'] - #for block in blocks: - #if dev['path'] == objects[block['path']][self.BLOCK]['Drive']: - #dev_name = block['path'].split('/')[-1] - #path = ''.join([i for i in dev_name if not i.isdigit()]) - #path = '/dev/' + path - #break - #size = dev_obj['Size'] - #item.append(vend+" "+name) - #item.append(path) - #item.append(size) - # return list class Info(object): diff --git a/tools/po-update.sh b/tools/po-update.sh index 215ac3b..f9edc82 100755 --- a/tools/po-update.sh +++ b/tools/po-update.sh @@ -10,7 +10,7 @@ fi cd "$(readlink -f "$(dirname "$0")/..")" -VERSION=(1.13) +VERSION=(1.14) DOMAIN=(isodumper) intltool-extract --type=gettext/xml polkit/org.mageia.isodumper.policy.in -- cgit v1.2.1 From bd0caa66d4f52f62a4f63b398dc047fa0183cc8e Mon Sep 17 00:00:00 2001 From: Papoteur Date: Sun, 18 Aug 2019 21:07:32 +0200 Subject: Add more logging --- backend/magiback | 11 +++++++---- backend/raw_write.py | 19 +++++++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/backend/magiback b/backend/magiback index e1ec093..6bf0202 100755 --- a/backend/magiback +++ b/backend/magiback @@ -10,7 +10,8 @@ import logging DEAMON_ORG = 'org.mageia.Magiback' DEAMON_INTERFACE = DEAMON_ORG ISODUMPER_INTERFACE = DEAMON_ORG + ".Isodumper" -logging.basicConfig(filename="/var/log/magiback.log",level=logging.DEBUG) +logging.basicConfig(filename="/var/log/magiback.log",format='%(asctime)s %(levelname)-8s %(message)s', + datefmt='%Y-%m-%d %H:%M:%S',level=logging.DEBUG) class Isodumper(raw_write.Dumper): """ @@ -61,6 +62,7 @@ class Isodumper(raw_write.Dumper): # Call translation catalog gettext.install(APP, localedir=DIR,) self.finished = threading.Event() + # finished is cleared at start of operation, and set at the end self.finished.clear() self._progress = 0 self.loop = GLib.MainLoop() @@ -84,7 +86,8 @@ class Isodumper(raw_write.Dumper): self.writing_perm = True self.writing_target = target else: - self.return_message = "Access denied" + self.return_message = "Writing: Access denied" + logging.debug(self.return_message) self.finished.set() def do_persistence(self, target, label): @@ -92,7 +95,7 @@ class Isodumper(raw_write.Dumper): if self.writing_perm and self.writing_target == target : self._do_persistence(target, label) else: - self.return_message = "Access denied" + self.return_message = "Persistence: Access denied" self.writing_perm = False self.writing_target = "" @@ -120,7 +123,6 @@ class Isodumper(raw_write.Dumper): return self._progress def do_unmount(self, device): - print("Unmounting") return self._do_unmount([device]) def get_sum(self, source): @@ -191,3 +193,4 @@ if __name__ == '__main__': ("Isodumper", Isodumper())) loop = GLib.MainLoop() loop.run() + logging.shutdown() diff --git a/backend/raw_write.py b/backend/raw_write.py index dbf8e19..d369d82 100755 --- a/backend/raw_write.py +++ b/backend/raw_write.py @@ -34,6 +34,7 @@ from subprocess import call, Popen, PIPE import hashlib import gnupg import time +import logging class Dumper(object): @@ -47,6 +48,7 @@ class Dumper(object): ifc=io.open(source, "rb",1) except: message = _('Reading error.')+ source + logging.debug(message) self.return_state = False self.return_message = message self.finished.set() @@ -85,6 +87,7 @@ class Dumper(object): ofc.write(buf) except: message = _("Writing error.") + logging.debug(message) self.return_state = False self.return_message = message self.finished.set() @@ -98,6 +101,7 @@ class Dumper(object): os.fsync(ofc) except: message = _("Writing error.") + logging.debug(message) self.return_state = False self.return_message = message self.finished.set() @@ -114,11 +118,13 @@ class Dumper(object): self._progress = 100 self.finished.set() self.return_state = True - self.return_message = _("Success") + self.return_message = _("Writing terminated") + logging.debug(self.return_message) return def _do_unmount(self, target): target = target[0] + logging.debug("Starting unmounting") message = _("No partition is mounted.") retcode = 0 try: @@ -144,12 +150,13 @@ class Dumper(object): message += _('Error, umount returned {}').format(str(retcode)) except OSError as e: message += _('Execution failed: {}').format(str(e)) - print(message) + logging.info(message) return not bool(retcode), message def _get_sum(self, source): self.return_state = False self.return_message = "" + logging.debug("Starting getting sum") # Check if the sum file has a valid signature gpg = gnupg.GPG() gpg.encoding = 'utf-8' @@ -178,8 +185,10 @@ class Dumper(object): except: self.return_message = _("Sum SHA512 file {} not found\n").format(source+'.sha512') self.sum_file = False + logging.info(self.return_message) def _check_write(self, target, source): + logging.debug("Start checking") self.return_state = False self.return_message = "" b = os.path.getsize(source) @@ -219,13 +228,15 @@ class Dumper(object): #pass self._progress = 100 + logging.info(self.return_message) self.return_state = True self.finished.set() def _do_persistence(self, target, label): + logging.debug("Start doing persistence partition") p = Popen(["fdisk",target], stdin = PIPE) p.communicate(input=b'n\np\n3\n\n\nw\n') - # exemple mkfs.ext4 -L mgalive-persist /dev/sdf3 + # example mkfs.ext4 -L mgalive-persist /dev/sdf3 process = Popen(['mkfs.ext4','-L', label, target+"3"]) working=True while working: @@ -237,7 +248,7 @@ class Dumper(object): else: process = None working= False - print(rc) + logging.debug("Persistence partition done") return rc -- cgit v1.2.1 From 0f029c3eda001ec9e45cdcade0abdfb6fbc3d3b6 Mon Sep 17 00:00:00 2001 From: Papoteur Date: Mon, 19 Aug 2019 21:39:32 +0200 Subject: Don't use message but logging when getting Mageia key, to avoid void messages in other parts --- backend/raw_write.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/raw_write.py b/backend/raw_write.py index d369d82..699d1fc 100755 --- a/backend/raw_write.py +++ b/backend/raw_write.py @@ -155,7 +155,6 @@ class Dumper(object): def _get_sum(self, source): self.return_state = False - self.return_message = "" logging.debug("Starting getting sum") # Check if the sum file has a valid signature gpg = gnupg.GPG() @@ -175,7 +174,7 @@ class Dumper(object): self.signature_checked = False except: self.signature_found = False - self.return_message = _("Signature file {} not found\n").format(sig_file) + logging.info(_("Signature file {} not found\n").format(sig_file)) try: # Look for sum files in the same directory as source with open(source+'.sha512','r') as fs: @@ -183,9 +182,8 @@ class Dumper(object): self.sum_check=(fs.readline()).split()[0] self.sum_file = True except: - self.return_message = _("Sum SHA512 file {} not found\n").format(source+'.sha512') + logging.info(_("Sum SHA512 file {} not found\n").format(source+'.sha512')) self.sum_file = False - logging.info(self.return_message) def _check_write(self, target, source): logging.debug("Start checking") -- cgit v1.2.1