7 commits - liveusb-creator liveusb/creator.py setup.py
Luke Macken
lmacken at fedoraproject.org
Mon Mar 9 23:52:37 UTC 2009
liveusb-creator | 2 +-
liveusb/creator.py | 9 +++++----
setup.py | 4 ++--
3 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit ef038b919babb8a135b401f0184baaad698cbe43
Merge: f37fab7... e620f39...
Author: Luke Macken <lmacken at redhat.com>
Date: Mon Mar 9 19:52:25 2009 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/liveusb-creator
commit f37fab7057072f849cddecf46024ef37e5ae28c3
Author: Luke Macken <lmacken at redhat.com>
Date: Mon Mar 9 19:50:28 2009 -0400
Skip devices when we cannot their volume information.
diff --git a/liveusb/creator.py b/liveusb/creator.py
index 878bd52..85171a7 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -687,6 +687,7 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
vol = win32api.GetVolumeInformation(drive)
except pywintypes.error, e:
self.log.error('Unable to get GetVolumeInformation(%s): %s' % (drive, str(e)))
+ continue
self.drives[drive] = {
'label': vol[0],
'mount': drive,
commit 71a4fb40c97fb5ce3d703ef97a2322120e701c7d
Author: Luke Macken <lmacken at redhat.com>
Date: Mon Mar 9 19:37:07 2009 -0400
3.6.2
diff --git a/liveusb-creator b/liveusb-creator
index 72773c9..0755693 100755
--- a/liveusb-creator
+++ b/liveusb-creator
@@ -18,7 +18,7 @@
#
# Author(s): Luke Macken <lmacken at redhat.com>
-__version__ = '3.6.1'
+__version__ = '3.6.2'
def parse_args():
from optparse import OptionParser
diff --git a/setup.py b/setup.py
index 2a5efd2..429b0a7 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ if sys.platform == 'win32':
setup(
name = 'liveusb-creator',
- version = '3.6.1',
+ version = '3.6.2',
packages = ['liveusb', 'liveusb/urlgrabber'],
scripts = ['liveusb-creator'],
license = 'GNU General Public License (GPL)',
@@ -55,7 +55,7 @@ if sys.platform == 'win32':
else:
setup(
name = 'liveusb-creator',
- version = '3.6.1',
+ version = '3.6.2',
packages = ['liveusb'],
scripts = ['liveusb-creator'],
license = 'GNU General Public License (GPL)',
commit 26a887bc1a05e4b1b84a2b56c1666073ac1676c2
Author: Piotr DrÄ
g <piotrdrag at gmail.com>
Date: Mon Mar 9 21:57:56 2009 +0000
Updated Polish translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/pl.po b/po/pl.po
index 00790a8..5a2e1a0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-13 23:44+0100\n"
-"PO-Revision-Date: 2008-11-13 23:45+0200\n"
+"POT-Creation-Date: 2009-03-09 22:26+0100\n"
+"PO-Revision-Date: 2009-03-09 22:35+0100\n"
"Last-Translator: Piotr DrÄ
g <piotrdrag at gmail.com>\n"
"Language-Team: Polish <pl at li.org>\n"
"MIME-Version: 1.0\n"
@@ -17,17 +17,17 @@ msgstr ""
msgid "You must run this application as root"
msgstr "Musisz uruchomiÄ tÄ aplikacjÄ jako root"
-#: ../liveusb/gui.py:69
+#: ../liveusb/gui.py:74
#, python-format
msgid "Unknown release: %s"
msgstr "Nieznane wydanie: %s"
-#: ../liveusb/gui.py:73
+#: ../liveusb/gui.py:78
#, python-format
msgid "Downloading %s..."
msgstr "Pobieranie %s..."
-#: ../liveusb/gui.py:156
+#: ../liveusb/gui.py:173
msgid ""
"Error: Cannot set the label or obtain the UUID of your device. Unable to "
"continue."
@@ -35,20 +35,37 @@ msgstr ""
"BÅÄ
d: nie można ustawiÄ etykiety lub uzyskaÄ UUID urzÄ
dzenia. Nie można "
"kontynuowaÄ."
-#: ../liveusb/gui.py:185
+#: ../liveusb/gui.py:203
#, python-format
msgid "Complete! (%s)"
msgstr "ZakoÅczono! (%s)"
-#: ../liveusb/gui.py:188 ../liveusb/gui.py:191
+#: ../liveusb/gui.py:207
msgid "LiveUSB creation failed!"
msgstr "Utworzenie Live USB nie powiodÅo siÄ!"
-#: ../liveusb/gui.py:331
+#: ../liveusb/gui.py:343
+msgid ""
+"Device is not yet mounted, so we cannot determine the amount of free space. "
+"Setting a maximum limit of 8G for the persistent storage."
+msgstr ""
+"UrzÄ
dzenie nie jest jeszcze zamontowane, wiÄc nie można okreÅliÄ wielkoÅci "
+"wolnego miejsca. Ustawianie maksymalnego ograniczenia do 8G dla pamiÄci "
+"staÅej."
+
+#: ../liveusb/gui.py:351
+msgid "Partition is FAT16; Restricting overlay size to 2G"
+msgstr "Partycja to FAT16; ograniczanie rozmiaru warstwy do 2G"
+
+#: ../liveusb/gui.py:390
msgid "Persistent Storage"
msgstr "PamiÄÄ staÅa"
-#: ../liveusb/gui.py:349
+#: ../liveusb/gui.py:412
+msgid "Unable to mount device"
+msgstr "Nie można zamontowaÄ urzÄ
dzenia"
+
+#: ../liveusb/gui.py:418
msgid ""
"Your device already contains a LiveOS.\n"
"If you continue, this will be overwritten."
@@ -56,48 +73,48 @@ msgstr ""
"UrzÄ
dzenie zawiera już system operacyjny Live.\n"
"JeÅli kontynuujesz, zostanie on zastÄ
piony."
-#: ../liveusb/gui.py:352
+#: ../liveusb/gui.py:421
msgid ""
"Warning: Creating a new persistent overlay will delete your existing one."
msgstr "Ostrzeżenie: tworzenie nowej warstwy trwaÅoÅci usunie istniejÄ
cÄ
."
-#: ../liveusb/gui.py:354
+#: ../liveusb/gui.py:423
msgid "Press 'Create Live USB' again if you wish to continue."
msgstr "NaciÅnij \"Utwórz Live USB\" ponownie, jeÅli chcesz kontynuowaÄ."
-#: ../liveusb/gui.py:400
+#: ../liveusb/gui.py:470
msgid "Download complete!"
msgstr "Pobieranie zakoÅczone!"
-#: ../liveusb/gui.py:404
+#: ../liveusb/gui.py:474
msgid "Download failed: "
msgstr "Pobieranie nie powiodÅo siÄ: "
-#: ../liveusb/gui.py:405
+#: ../liveusb/gui.py:475
msgid "You can try again to resume your download"
msgstr "Można spróbowaÄ ponownie, aby wznowiÄ pobieranie"
-#: ../liveusb/gui.py:409
+#: ../liveusb/gui.py:479
msgid "Select Live ISO"
msgstr "Wybierz plik ISO Live"
-#: ../liveusb/gui.py:416
+#: ../liveusb/gui.py:486
msgid ""
-"Sorry, I'm having trouble encoding the filename of your livecd. You may "
-"have better luck if you move your ISO to the root of your drive (ie: C:\\)"
+"Unable to encode the filename of your livecd. You may have better luck if "
+"you move your ISO to the root of your drive (ie: C:\\)"
msgstr ""
-"Przepraszam, wystÄ
piÅ bÅÄ
d podczas kodowania nazwy pliku Live CD. Åatwiej "
-"bÄdzie po przeniesieniu pliku ISO do gÅównego folderu napÄdu (np. C:\\)"
+"Nie można zakodowaÄ nazwy pliku Live CD. Åatwiej bÄdzie po przeniesieniu "
+"pliku ISO do gÅównego folderu napÄdu (np. C:\\)"
-#: ../liveusb/gui.py:422
+#: ../liveusb/gui.py:491
msgid "selected"
msgstr "wybrano"
-#: ../liveusb/creator.py:134
+#: ../liveusb/creator.py:135
msgid "Setting up OLPC boot file..."
msgstr "Ustawianie pliku startowego OLPC..."
-#: ../liveusb/creator.py:186
+#: ../liveusb/creator.py:188
#, python-format
msgid ""
"There was a problem executing the following command: `%s`\n"
@@ -107,11 +124,11 @@ msgstr ""
"Bardziej szczegóÅowy dziennik bÅÄdu zostaÅ zapisany do \"liveusb-creator.log"
"\""
-#: ../liveusb/creator.py:193
+#: ../liveusb/creator.py:195
msgid "Verifying SHA1 of LiveCD image..."
msgstr "Sprawdzanie sumy kontrolnej SHA1 obrazu Live CD..."
-#: ../liveusb/creator.py:215
+#: ../liveusb/creator.py:217
msgid ""
"Error: The SHA1 of your Live CD is invalid. You can run this program with "
"the --noverify argument to bypass this verification check."
@@ -119,105 +136,105 @@ msgstr ""
"BÅÄ
d: suma kontrolna SHA1 obrazu Live CD jest nieprawidÅowa. Można uruchomiÄ "
"ten program za pomocÄ
parametru --noverify, aby obejÅÄ to sprawdzanie."
-#: ../liveusb/creator.py:221
+#: ../liveusb/creator.py:223
msgid "Unknown ISO, skipping checksum verification"
msgstr "Nieznany plik ISO, pomijanie sprawdzania sum kontrolnych"
-#: ../liveusb/creator.py:233
+#: ../liveusb/creator.py:234
msgid "Not enough free space on device."
msgstr "NiewystarczajÄ
ca iloÅÄ wolnego miejsca na urzÄ
dzeniu."
-#: ../liveusb/creator.py:240
+#: ../liveusb/creator.py:241
msgid "Creating"
msgstr "Tworzenie"
-#: ../liveusb/creator.py:241
+#: ../liveusb/creator.py:242
msgid "persistent overlay"
msgstr "warstwa trwaÅoÅci"
-#: ../liveusb/creator.py:273
+#: ../liveusb/creator.py:274
msgid "Removing existing Live OS"
msgstr "Usuwanie istniejÄ
cego systemu operacyjnego Live"
-#: ../liveusb/creator.py:282
+#: ../liveusb/creator.py:283
#, python-format
msgid "Unable to remove previous LiveOS: %s"
msgstr "Nie można usunÄ
Ä poprzedniego systemu operacyjnego Live: %s"
-#: ../liveusb/creator.py:313
+#: ../liveusb/creator.py:314
#, python-format
msgid "Cannot find device %s"
msgstr "Nie można znaleÅºÄ urzÄ
dzenia %s"
-#: ../liveusb/creator.py:332
+#: ../liveusb/creator.py:334
msgid "Resetting MBR..."
msgstr "Przywracanie MBR..."
-#: ../liveusb/creator.py:377
+#: ../liveusb/creator.py:392
msgid "Unable to find any USB drives"
msgstr "Nie można znaleÅºÄ Å¼adnych urzÄ
dzeÅ USB"
-#: ../liveusb/creator.py:400
+#: ../liveusb/creator.py:416
#, python-format
msgid "Filesystem for %s unknown!"
msgstr "System plików %s jest nieznany!"
-#: ../liveusb/creator.py:413
+#: ../liveusb/creator.py:429
#, python-format
msgid "Unable to mount device: %s"
msgstr "Nie można zamontowaÄ urzÄ
dzenia: %s"
-#: ../liveusb/creator.py:449 ../liveusb/creator.py:614
+#: ../liveusb/creator.py:466 ../liveusb/creator.py:704
msgid "Verifying filesystem..."
msgstr "Sprawdzanie systemu plików..."
-#: ../liveusb/creator.py:452
+#: ../liveusb/creator.py:469
#, python-format
msgid "Unknown filesystem for %s. Your device may need to be reformatted."
msgstr ""
"Nieznany system plików %s. UrzÄ
dzenie może wymagaÄ ponownego sformatowania."
-#: ../liveusb/creator.py:455
+#: ../liveusb/creator.py:472
#, python-format
msgid "Unsupported filesystem: %s"
msgstr "NieobsÅugiwany system plików: %s"
-#: ../liveusb/creator.py:479
+#: ../liveusb/creator.py:496
msgid "Your MBR appears to be blank"
msgstr "MBR wydaje siÄ byÄ pusty"
-#: ../liveusb/creator.py:484 ../liveusb/creator.py:649
+#: ../liveusb/creator.py:506 ../liveusb/creator.py:739
msgid "Extracting live image to USB device..."
msgstr "Rozpakowywanie obrazu Live na urzÄ
dzenie USB..."
-#: ../liveusb/creator.py:490
+#: ../liveusb/creator.py:512
msgid "Unable to find LiveOS on ISO"
msgstr "Nie można znaleÅºÄ systemu operacyjnego Live w pliku ISO"
-#: ../liveusb/creator.py:501 ../liveusb/creator.py:656
+#: ../liveusb/creator.py:524 ../liveusb/creator.py:747
msgid "Wrote to device at"
msgstr "Zapisano do urzÄ
dzenia na"
-#: ../liveusb/creator.py:514
+#: ../liveusb/creator.py:537
msgid "Installing bootloader..."
msgstr "Instalowanie programu startowego..."
-#: ../liveusb/creator.py:552
+#: ../liveusb/creator.py:579
msgid "Verifying ISO MD5 checksum"
msgstr "Sprawdzanie sumy kontrolnej MD5 pliku ISO"
-#: ../liveusb/creator.py:610
+#: ../liveusb/creator.py:700
msgid "Unable to find any removable devices"
msgstr "Nie można znaleÅºÄ Å¼adnych urzÄ
dzeÅ wymiennych"
-#: ../liveusb/creator.py:618
+#: ../liveusb/creator.py:708
msgid ""
"Make sure your USB key is plugged in and formatted with the FAT filesystem"
msgstr ""
"Upewnij siÄ, że klucz USB jest podÅÄ
czony i sformatowany w systemie plików "
"FAT"
-#: ../liveusb/creator.py:621
+#: ../liveusb/creator.py:711
#, python-format
msgid ""
"Unsupported filesystem: %s\n"
@@ -226,15 +243,15 @@ msgstr ""
"NieobsÅugiwany system plików: %s\n"
"Wykonaj kopiÄ zapasowÄ
i sformatuj klucz USB w systemie plików FAT."
-#: ../liveusb/creator.py:662
+#: ../liveusb/creator.py:753
msgid "Installing bootloader"
msgstr "Instalowanie programu startowego"
-#: ../liveusb/creator.py:704
+#: ../liveusb/creator.py:797
msgid "Cannot find"
msgstr "Nie można znaleźÄ"
-#: ../liveusb/creator.py:705
+#: ../liveusb/creator.py:798
msgid ""
"Make sure to extract the entire liveusb-creator zip file before running this "
"program."
@@ -242,11 +259,11 @@ msgstr ""
"Upewnij siÄ, że rozpakowano caÅy plik ZIP liveusb-creator przed "
"uruchomieniem tego programu."
-#: ../liveusb/linux_dialog.py:98 ../liveusb/windows_dialog.py:104
+#: ../liveusb/windows_dialog.py:104
msgid "Fedora LiveUSB Creator"
msgstr "Tworzenie LiveUSB Fedory"
-#: ../liveusb/linux_dialog.py:99 ../liveusb/windows_dialog.py:105
+#: ../liveusb/windows_dialog.py:105
msgid ""
"This button will begin the LiveUSB creation process. This entails "
"optionally downloading a release (if an existing one wasn't selected), "
@@ -258,15 +275,15 @@ msgstr ""
"rozpakowanie pliku ISO na urzÄ
dzenie USB, utworzenie warstwy trwaÅoÅci i "
"zainstalowanie programu startowego."
-#: ../liveusb/linux_dialog.py:100 ../liveusb/windows_dialog.py:106
+#: ../liveusb/windows_dialog.py:106
msgid "Create Live USB"
msgstr "Utwórz Live USB"
-#: ../liveusb/linux_dialog.py:101 ../liveusb/windows_dialog.py:107
+#: ../liveusb/windows_dialog.py:107
msgid "This is the status console, where all messages get written to."
msgstr "To jest konsola stanu, gdzie wyÅwietlane sÄ
wszystkie komunikaty."
-#: ../liveusb/linux_dialog.py:102 ../liveusb/windows_dialog.py:108
+#: ../liveusb/windows_dialog.py:108
msgid ""
"This is the progress bar that will indicate how far along in the LiveUSB "
"creation process you are"
@@ -274,7 +291,7 @@ msgstr ""
"To jest pasek postÄpu, wskazujÄ
cy jak daleko posunÄ
Å siÄ proces tworzenia "
"Live USB"
-#: ../liveusb/linux_dialog.py:103 ../liveusb/windows_dialog.py:109
+#: ../liveusb/windows_dialog.py:109
msgid ""
"If you do not select an existing Live CD, the selected release will be "
"downloaded for you."
@@ -282,15 +299,15 @@ msgstr ""
"JeÅli istniejÄ
cy Live CD nie zostanie wybrany, wybrane wydanie zostanie "
"pobrane."
-#: ../liveusb/linux_dialog.py:104 ../liveusb/windows_dialog.py:110
+#: ../liveusb/windows_dialog.py:110
msgid "Download Fedora"
msgstr "Pobierz FedorÄ"
-#: ../liveusb/linux_dialog.py:105 ../liveusb/windows_dialog.py:111
+#: ../liveusb/windows_dialog.py:111
msgid "or"
msgstr "lub"
-#: ../liveusb/linux_dialog.py:106 ../liveusb/windows_dialog.py:112
+#: ../liveusb/windows_dialog.py:112
msgid ""
"This button allows you to browse for an existing Live CD ISO that you have "
"previously downloaded. If you do not select one, a release will be "
@@ -300,15 +317,15 @@ msgstr ""
"zostaÅ wczeÅniej pobrany. JeÅli żaden nie zostanie wybrany, wydanie zostanie "
"automatycznie pobrane."
-#: ../liveusb/linux_dialog.py:107 ../liveusb/windows_dialog.py:113
+#: ../liveusb/windows_dialog.py:113
msgid "Use existing Live CD"
msgstr "Użyj istniejÄ
cego Live CD"
-#: ../liveusb/linux_dialog.py:108 ../liveusb/windows_dialog.py:114
+#: ../liveusb/windows_dialog.py:114
msgid "Browse"
msgstr "PrzeglÄ
daj"
-#: ../liveusb/linux_dialog.py:110 ../liveusb/windows_dialog.py:116
+#: ../liveusb/windows_dialog.py:116
msgid ""
"This is the USB stick that you want to install your Live CD on. This device "
"must be formatted with the FAT filesystem."
@@ -316,7 +333,11 @@ msgstr ""
"To jest klucz USB, na którym ma byÄ zainstalowane Live CD. To urzÄ
dzenie "
"musi byÄ sformatowane za pomocÄ
systemu plików FAT."
-#: ../liveusb/linux_dialog.py:112 ../liveusb/windows_dialog.py:118
+#: ../liveusb/windows_dialog.py:117
+msgid "Target Device"
+msgstr "UrzÄ
dzenie docelowe"
+
+#: ../liveusb/windows_dialog.py:118
msgid ""
"By allocating extra space on your USB stick for a persistent overlay, you "
"will be able to store data and make permanent modifications to your live "
@@ -327,10 +348,6 @@ msgstr ""
"przechowywaÄ dane i modyfikacje systemu operacyjnego Live. Bez niej nie "
"można zapisywaÄ danych, które zostanÄ
zachowane po ponownym uruchomieniu."
-#: ../liveusb/linux_dialog.py:113 ../liveusb/windows_dialog.py:119
+#: ../liveusb/windows_dialog.py:119
msgid "Persistent Storage (0 Mb)"
msgstr "PamiÄÄ staÅa (0 MB)"
-
-#: ../liveusb/windows_dialog.py:117
-msgid "Target Device"
-msgstr "UrzÄ
dzenie docelowe"
commit 0213856d6e7a6f79a767e3383a44b62b7221d329
Author: Luke Macken <lmacken at redhat.com>
Date: Mon Mar 9 11:00:08 2009 -0400
Make our windows device detection a little bit more robust
diff --git a/liveusb/creator.py b/liveusb/creator.py
index ee36aed..878bd52 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -682,13 +682,13 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
for drive in [l + ':' for l in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ']:
if win32file.GetDriveType(drive) == win32file.DRIVE_REMOVABLE or \
drive == self.opts.force:
+ vol = [None]
try:
vol = win32api.GetVolumeInformation(drive)
- label = vol[0]
except pywintypes.error, e:
- label = None
+ self.log.error('Unable to get GetVolumeInformation(%s): %s' % (drive, str(e)))
self.drives[drive] = {
- 'label': label,
+ 'label': vol[0],
'mount': drive,
'uuid': self._get_device_uuid(drive),
'free': self.get_free_bytes(drive) / 1024**2,
commit 4bf638140b04f2c5bb2168c4e9e0e9e7a68b3005
Author: Luke Macken <lmacken at redhat.com>
Date: Mon Mar 9 10:54:56 2009 -0400
3.6.1, windows bugfix release
diff --git a/liveusb-creator b/liveusb-creator
index 60afa81..72773c9 100755
--- a/liveusb-creator
+++ b/liveusb-creator
@@ -18,7 +18,7 @@
#
# Author(s): Luke Macken <lmacken at redhat.com>
-__version__ = '3.6'
+__version__ = '3.6.1'
def parse_args():
from optparse import OptionParser
diff --git a/setup.py b/setup.py
index 43b98eb..2a5efd2 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ if sys.platform == 'win32':
setup(
name = 'liveusb-creator',
- version = '3.6',
+ version = '3.6.1',
packages = ['liveusb', 'liveusb/urlgrabber'],
scripts = ['liveusb-creator'],
license = 'GNU General Public License (GPL)',
@@ -55,7 +55,7 @@ if sys.platform == 'win32':
else:
setup(
name = 'liveusb-creator',
- version = '3.6',
+ version = '3.6.1',
packages = ['liveusb'],
scripts = ['liveusb-creator'],
license = 'GNU General Public License (GPL)',
commit 608d4b8da74f56082342a538c22f2151d7e839de
Author: Luke Macken <lmacken at redhat.com>
Date: Mon Mar 9 10:51:00 2009 -0400
Import the pywintypes module (#517)
diff --git a/liveusb/creator.py b/liveusb/creator.py
index 59a8779..ee36aed 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -677,7 +677,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
class WindowsLiveUSBCreator(LiveUSBCreator):
def detect_removable_drives(self):
- import win32file, win32api
+ import win32file, win32api, pywintypes
self.drives = {}
for drive in [l + ':' for l in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ']:
if win32file.GetDriveType(drive) == win32file.DRIVE_REMOVABLE or \
More information about the liveusb-creator
mailing list