diff options
| -rwxr-xr-x[-rw-r--r--] | build_windows.bat | 4 | ||||
| -rwxr-xr-x | liveusb/creator.py | 655 | ||||
| -rwxr-xr-x | liveusb/gui.py | 20 | ||||
| -rwxr-xr-x[-rw-r--r--] | liveusb/windows_dialog.py | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | setup.py | 19 | ||||
| -rw-r--r-- | tools/dd.exe | bin | 342016 -> 0 bytes | |||
| -rw-r--r-- | tools/dd.exe.manifest | 12 | ||||
| -rwxr-xr-x | tools/dd.sh | 23 | ||||
| -rwxr-xr-x | usbdumper (renamed from mandriva-seed) | 2 |
9 files changed, 407 insertions, 330 deletions
diff --git a/build_windows.bat b/build_windows.bat index 1b2cc58..1fd9815 100644..100755 --- a/build_windows.bat +++ b/build_windows.bat @@ -1,2 +1,2 @@ -set PATH=C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Qt\2010.02.1\qt\bin;C:\Qt\2010.02.1\mingw\bin;
-c:\Python26\python.exe -OO setup.py py2exe
+set PATH=C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Qt\2009.03\qt\bin;C:\Qt\2009.03\mingw\bin;
+c:\Python27\python.exe -OO setup.py py2exe
diff --git a/liveusb/creator.py b/liveusb/creator.py index 0e19734..5796280 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -17,293 +17,404 @@ # permission of Red Hat, Inc. # # Author(s): Luke Macken <lmacken@redhat.com> -# Aurelien Lefebvre <alefebvre@mandriva.com> -# Luis Medinas <luis.medinas@caixamagica.pt> +# Aurelien Lefebvre <alefebvre@mandriva.com> +# Luis Medinas <luis.medinas@caixamagica.pt> +# Yves Brungard -import subprocess import logging import os -import re import signal -from datetime import datetime +#from datetime import datetime from stat import ST_SIZE -from threading import Thread -from time import sleep +#from threading import Thread +#from time import sleep from liveusb import _ class LiveUSBError(Exception): - _message = "" - def __init__(self, message): self._message = message - def _get_message(self): return self._message - def _set_message(self, message): self._message = message - message = property(_get_message, _set_message) + _message = "" + def __init__(self, message): self._message = message + def _get_message(self): return self._message + def _set_message(self, message): self._message = message + message = property(_get_message, _set_message) class LiveUSBCreator(object): - """ An OS-independent parent class for Live USB Creators """ - - iso = None - drives = {} - pids = [] - isosize = 0 - log = None - drive = None - - def __init__(self, opts): - self.opts = opts - self._setup_logger() - - def _setup_logger(self): - self.log = logging.getLogger(__name__) - level = logging.INFO - if self.opts.verbose: - level = logging.DEBUG - self.log.setLevel(level) - self.handler = logging.StreamHandler() - self.handler.setLevel(level) - formatter = logging.Formatter("[%(module)s:%(lineno)s] %(message)s") - self.handler.setFormatter(formatter) - self.log.addHandler(self.handler) - - def detect_removable_drives(self): - """ This method should populate self.drives with removable devices """ - raise NotImplementedError - - def terminate(self): - """ Terminate any subprocesses that we have spawned """ - raise NotImplementedError - - def set_iso(self, iso): - """ Select the given ISO """ - self.iso = self._to_unicode(iso) - self.isosize = os.stat(self.iso)[ST_SIZE] - - def _to_unicode(self, obj, encoding='utf-8'): - if hasattr(obj, 'toUtf8'): # PyQt4.QtCore.QString - obj = str(obj.toUtf8()) - #if isinstance(obj, basestring): - # if not isinstance(obj, unicode): - # obj = unicode(obj, encoding, 'replace') - return obj - - def _test_hybrid_1(self, iso): - hybrid = False - for i in range(0,512): - if not iso.read(1) == '\x00': - hybrid = True - if hybrid: - break - return hybrid - - def _test_hybrid_2(self, iso): - hybrid = False - iso.seek(0x1fe) - if iso.read(1) == '\x55': - iso.seek(0x1ff) - if iso.read(1) == '\xaa': - hybrid = True - return hybrid - - def _test_hybrid_3(self, iso): - hybrid = True - iso.seek(0x200) - for i in range(0x200,0x8000): - if iso.read(1) != '\x00': - hybrid = False - break - return hybrid - - def is_hybrid(self, iso): - isofile = open(iso, "rb") - hybrid = self._test_hybrid_1(isofile) and self._test_hybrid_2(isofile) and self._test_hybrid_3(isofile) - isofile.close() - return hybrid + """ An OS-independent parent class for Live USB Creators """ + + iso = None + drives = {} + pids = [] + isosize = 0 + log = None + drive = None + + def __init__(self, opts): + self.opts = opts + self._setup_logger() + + def _setup_logger(self): + self.log = logging.getLogger(__name__) + level = logging.INFO + if self.opts.verbose: + level = logging.DEBUG + self.log.setLevel(level) + self.handler = logging.StreamHandler() + self.handler.setLevel(level) + formatter = logging.Formatter("[%(module)s:%(lineno)s] %(message)s") + self.handler.setFormatter(formatter) + self.log.addHandler(self.handler) + + def detect_removable_drives(self): + """ This method should populate self.drives with removable devices """ + raise NotImplementedError + + def terminate(self): + """ Terminate any subprocesses that we have spawned """ + raise NotImplementedError + + def set_iso(self, iso): + """ Select the given ISO """ + self.iso = self._to_unicode(iso) + self.log.info("File "+self.iso) + self.isosize = os.stat(self.iso)[ST_SIZE] + + def _to_unicode(self, obj, encoding='utf-8'): + if hasattr(obj, 'toUtf8'): # PyQt4.QtCore.QString + obj = str(obj.toUtf8()) + #if isinstance(obj, basestring): + # if not isinstance(obj, unicode): + # obj = unicode(obj, encoding, 'replace') + return obj + + def _test_hybrid_1(self, iso): + hybrid = False + for i in range(0,512): + if not iso.read(1) == '\x00': + hybrid = True + if hybrid: + break + return hybrid + + def _test_hybrid_2(self, iso): + hybrid = False + iso.seek(0x1fe) + if iso.read(1) == '\x55': + iso.seek(0x1ff) + if iso.read(1) == '\xaa': + hybrid = True + return hybrid + + def _test_hybrid_3(self, iso): + hybrid = True + iso.seek(0x200) + for i in range(0x200,0x8000): + if iso.read(1) != '\x00': + hybrid = False + break + return hybrid + + def is_hybrid(self, iso): + isofile = open(iso, "rb") + hybrid = self._test_hybrid_1(isofile) and self._test_hybrid_2(isofile) and self._test_hybrid_3(isofile) + isofile.close() + return hybrid class LinuxLiveUSBCreator(LiveUSBCreator): - bus = None # the dbus.SystemBus - hal = None # the org.freedesktop.Hal.Manager dbus.Interface - - def detect_removable_drives(self): - """ Detect all removable USB storage devices using HAL via D-Bus """ - import dbus - self.drives = {} - self.bus = dbus.SystemBus() - hal_obj = self.bus.get_object("org.freedesktop.Hal", - "/org/freedesktop/Hal/Manager") - self.hal = dbus.Interface(hal_obj, "org.freedesktop.Hal.Manager") - - devices = [] - devices = self.hal.FindDeviceByCapability("storage") - - for device in devices: - try: - dev = self._get_device(device) - if dev.GetProperty("storage.bus") == "usb": - self._add_device(dev) - except dbus.exceptions.DBusException: - pass - - if not len(self.drives): - raise LiveUSBError(_("Unable to find any USB drives")) - - def _add_device(self, dev, parent=None): - model = None - capacity = None - try: - model = dev.GetProperty('storage.model') - capacity = str(dev.GetProperty('storage.removable.media_size')) - except Exception: - pass - - self.drives[dev.GetProperty('block.device')] = { - 'name' : dev.GetProperty('block.device'), - 'model' : model, - 'capacity' : capacity - } - - def _get_device(self, udi): - """ Return a dbus Interface to a specific HAL device UDI """ - import dbus - dev_obj = self.bus.get_object("org.freedesktop.Hal", udi) - return dbus.Interface(dev_obj, "org.freedesktop.Hal.Device") - - def build_disk(self, progress_thread): - - isosize = float(self.isosize) - pattern = "^([0-9]+) bytes .*" - patternCompiled = re.compile(pattern) - - pidPattern = "^DDPID=([0-9]+).*" - pidPatternCompiled = re.compile(pidPattern) - - drive_infos = self.drives[self.drive] - if drive_infos.has_key("capacity") and drive_infos["capacity"]: - self.log.debug("Iso size = %s" % str(isosize)) - self.log.debug("Device capacity = %s " % str(drive_infos['capacity'])) - if int(drive_infos['capacity']) < int(isosize): - raise LiveUSBError(_("Selected iso is too large for the selected device")) - - dd = '/usr/sbin/liveusb-dd.sh "' + self.iso + '" "' + self.drive + '"' - self.log.debug(dd) - p = subprocess.Popen(dd, - shell=True, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - env={"LC_ALL": "C"}) - - ppid = p.pid - ddpid = None - - self.pids.append(ppid) - - # Updating progress bar by parsing /bin/dd output - while True: - line = p.stdout.readline() - if not line: - break - - if not ddpid: - pidm = re.findall(pidPatternCompiled, line) - if len(pidm) > 0: - ddpid = int(pidm[0]) - self.pids.append(ddpid) - - m = re.findall(patternCompiled, line) - if len(m) > 0: - current = float(m[0]) - progress = (current/isosize)*100 - progress = round(progress, 2) - progress_thread.update(progress) - - self.pids.remove(ppid) - self.pids.remove(ddpid) - - def terminate(self): - for pid in self.pids: - try: - os.kill(pid, signal.SIGHUP) - self.log.debug("Killed process %d" % pid) - except OSError: - pass + bus = None # the dbus.SystemBus +# hal = None # the org.freedesktop.Hal.Manager dbus.Interface + iface = None # the org.freedesktop.Udisks.Manager dbus.Interface + + def detect_removable_drives(self): + """ Detect all removable USB storage devices using UDisks via D-Bus """ + import dbus + self.drives = {} + self.bus = dbus.SystemBus() +# hal_obj = self.bus.get_object("org.freedesktop.Hal", +# "/org/freedesktop/Hal/Manager") +# self.hal = dbus.Interface(hal_obj, "org.freedesktop.Hal.Manager") + proxy = self.bus.get_object("org.freedesktop.UDisks", "/org/freedesktop/UDisks") + self.iface = dbus.Interface(proxy, "org.freedesktop.UDisks") + + devs = self.iface.EnumerateDevices() + + for dev in devs: + dev_obj = self.bus.get_object("org.freedesktop.UDisks", dev) + dev = dbus.Interface(dev_obj, "org.freedesktop.DBus.Properties") + + if str(dev.Get('', 'DriveConnectionInterface')) == 'usb' and not str(dev.Get('', 'PartitionType')) and str(dev.Get('', 'DeviceIsMediaAvailable')) == '1': + self._add_device(dev) + +# devices = [] +# devices = self.hal.FindDeviceByCapability("storage") +# +# for device in devices: +# try: +# dev = self._get_device(device) +# if dev.GetProperty("storage.bus") == "usb": +# self._add_device(dev) +# except dbus.exceptions.DBusException: +# pass + + if not len(self.drives): + raise LiveUSBError(_("Unable to find any USB drives")) + + def _add_device(self, dev, parent=None): + model = str(dev.Get('', 'DriveModel')) + capacity = str(dev.Get('', 'DeviceSize')) + name= str(dev.Get('', 'DeviceFile')) +# model = None +# capacity = None +# try: +# model = dev.GetProperty('storage.model') +# capacity = str(dev.GetProperty('storage.removable.media_size')) +# except Exception: +# pass +# +# self.drives[dev.GetProperty('block.device')] = { +# 'name' : dev.GetProperty('block.device'), +# 'model' : model, +# 'capacity' : capacity + self.drives[name] = { + 'name' : name, + 'model' : model, + 'capacity' : capacity + } + + + def build_disk(self, progress_thread): + + isosize = float(self.isosize) + source = self.iso + target = self.drive + capacity=self.drives[self.drive]['capacity'] + if self.backup.get_active() : + backup_dest=self.backup_select.get_label() + self.log.info(_('Backup in:')+' '+backup_dest) + self.log.info(_('Image: ')+source) + self.log.info(_('Target Device: ')+target) + b = os.path.getsize(source) + if isosize > capacity : + raise LiveUSBError(_("Selected iso is too large for the selected device")) + else: + if capacity> 1024*1024*1024*32 : + raise LiveUSBError(_("Selected device is too big (>32Mb) to be a USB stick")) + self.do_umount(target) + # Writing step + self.raw_write(source, target, b) + #pattern = "^([0-9]+) bytes .*" + #patternCompiled = re.compile(pattern) + + #pidPattern = "^DDPID=([0-9]+).*" + #pidPatternCompiled = re.compile(pidPattern) + + #drive_infos = self.drives[self.drive] + #if drive_infos.has_key("capacity") and drive_infos["capacity"]: + #self.log.debug("Iso size = %s" % str(isosize)) + #self.log.debug("Device capacity = %s " % str(drive_infos['capacity'])) + #if int(drive_infos['capacity']) < int(isosize): + #raise LiveUSBError(_("Selected iso is too large for the selected device")) + + #dd = 'tools/dd.sh "' + self.iso + '" "' + self.drive + '"' + #self.log.debug(dd) + #p = subprocess.Popen(dd, + #shell=True, + #stdout=subprocess.PIPE, + #stderr=subprocess.STDOUT, + #env={"LC_ALL": "C"}) + + #ppid = p.pid + #ddpid = None + + #self.pids.append(ppid) + + ## Updating progress bar by parsing /bin/dd output + #while True: + #line = p.stdout.readline() + #if not line: + #break + + #if not ddpid: + #pidm = re.findall(pidPatternCompiled, line) + #if len(pidm) > 0: + #ddpid = int(pidm[0]) + #self.pids.append(ddpid) + + #m = re.findall(patternCompiled, line) + #if len(m) > 0: + #current = float(m[0]) + #progress = (current/isosize)*100 + #progress = round(progress, 2) + #progress_thread.update(progress) + + #self.pids.remove(ppid) + #self.pids.remove(ddpid) + def raw_write(self, source, target, b, progress_thread): + import io + bs=4096*128 + try: + ifc=io.open(source, "rb",1) + except: + raise LiveUSBError(_('Reading error.')) + else: + try: + ofc= io.open(target, 'wb',0) + except: + raise LiveUSBError(_('You have not the rights for writing on the device')) + else: + self.log.debug(_('Executing copy from ')+source+_(' to ')+target) + steps=range(0, b+1, b/100) + indice=1 + written=0 + ncuts=b/bs + for i in xrange(0,ncuts): + try: + buf=ifc.read(bs) + except: + raise LiveUSBError(_("Reading error.")) + try: + ofc.write(buf) + except: + raise LiveUSBError(_("Writing error.")) + written= written+bs + if written > steps[indice]: + if indice%5==0: + self.log.info(_('Wrote: ')+str(indice)+'% '+str(written)+_(' bytes')) + progress_thread.update(indice) + indice +=1 + try: + os.fsync(ofc) + except: + raise LiveUSBError(_("Writing error.")) + progress_thread.update(100) + self.log.debug(_('Image ')+source.split('/')[-1]+_(' successfully written to')+target) + self.log.debug(_('Bytes written: ')+str(written)) + try: + ofc.close() + except: + raise LiveUSBError(_("Writing error.")) + ifc.close() + + def terminate(self): + for pid in self.pids: + try: + os.kill(pid, signal.SIGHUP) + self.log.debug("Killed process %d" % pid) + except OSError: + pass class WindowsLiveUSBCreator(LiveUSBCreator): - def detect_removable_drives(self): - import win32file, win32api, pywintypes, wmi - self.drives = {} - - c = wmi.WMI() - - for physical_disk in c.Win32_DiskDrive (): - if physical_disk.InterfaceType == "USB": - if len(physical_disk.Capabilities): - for objElem in physical_disk.Capabilities: - if objElem == 7: - self.drives[physical_disk.DeviceID] = { - 'name' : physical_disk.DeviceID, - 'model' : physical_disk.Model, - 'device' : physical_disk.DeviceID, - 'capacity': physical_disk.Size - } - break - if not len(self.drives): - raise LiveUSBError(_("There isn't any removable drive available")) - - def _get_device(self, drive): - if not self.drives[drive]: - return None - return self.drives[drive]['device'] - - def build_disk(self, progress_thread): - - isosize = float(self.isosize) - pattern = "^([0-9,]+).*" - patternCompiled = re.compile(pattern) - -# f = subprocess.Popen(['format', self.drive, '/q', '/y', '/fs:fat32'], shell=True) -# self.log.debug("Formating %s" % self.drive) -# f.wait() -# self.log.debug("Done, exit code: %d" % f.wait()) - - dd = os.path.join("tools", "dd.exe") - dd += " bs=8M" + " if=\"%s\" of=%s --progress" % (self.iso, self._get_device(self.drive)) - self.log.debug(dd) - p = subprocess.Popen(dd, - shell=True, - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, - universal_newlines=True) - - ppid = p.pid - - self.pids.append(ppid) - - # Updating progress bar by parsing /bin/dd output - while True: - line = p.stdout.readline() - if not line: - break - - m = re.findall(patternCompiled, line) - if len(m) > 0: - current = float(re.sub(",", "", m[0])) - progress = (current/isosize)*100 - progress = round(progress, 2) - progress_thread.update(progress) - - self.pids.remove(ppid) - - def terminate(self): - """ Terminate any subprocesses that we have spawned """ - import win32api, win32con, pywintypes - for pid in self.pids: - try: - handle = win32api.OpenProcess(win32con.PROCESS_TERMINATE, - False, pid) - self.log.debug("Terminating process %s" % pid) - win32api.TerminateProcess(handle, -2) - win32api.CloseHandle(handle) - except pywintypes.error: - pass + def detect_removable_drives(self): +# import win32file, win32api, pywintypes, wmi + import wmi + self.drives = {} + + c = wmi.WMI() + + for physical_disk in c.Win32_DiskDrive (): + if physical_disk.InterfaceType == "USB": + if len(physical_disk.Capabilities): +# for objElem in physical_disk.Capabilities: +# if objElem == 7: + self.drives[physical_disk.DeviceID] = { + 'name' : physical_disk.DeviceID, + 'model' : physical_disk.Model, + 'device' : physical_disk.DeviceID, + 'capacity': physical_disk.Size + } +# break + if not len(self.drives): + raise LiveUSBError(_("There isn't any removable drive available")) + + def _get_device(self, drive): + if not self.drives[drive]: + return None + return self.drives[drive]['device'] + + def build_disk(self, progress_thread): + + isosize = float(self.isosize) + source = self.iso + target = self.drive + capacity=eval(self.drives[self.drive]['capacity']) + self.log.info(_('Image: ')+source) + self.log.info(_('Target Device: ')+self.drive) + b = os.path.getsize(source) + if isosize > capacity : + raise LiveUSBError(_("Selected iso is too large for the selected device")) + else: + if capacity> 1024*1024*1024*32 : + raise LiveUSBError(_("Selected device is too big (>32Mb) to be a USB stick")) + # Writing step + self.raw_write(source, target, b, progress_thread) + + def raw_write(self, source, target, b, progress_thread): + import io + import win32con + import win32file, win32event + import winioctlcon + bs=4096*128l + try: + ifc=io.open(source, "rb",1) + except: + raise LiveUSBError(_('Reading error.')) + else: + try: + ofc= win32file.CreateFile(target, + win32con.GENERIC_WRITE|win32con.GENERIC_WRITE, + win32con.FILE_SHARE_READ | win32con.FILE_SHARE_WRITE, + None, + win32file.OPEN_EXISTING, + 0, + None) + win32file.DeviceIoControl(ofc, winioctlcon.FSCTL_LOCK_VOLUME, None, 0,None) + win32file.DeviceIoControl(ofc, winioctlcon.FSCTL_DISMOUNT_VOLUME, None, 0,None ) + except: + raise LiveUSBError(_('You have not the rights for writing on the device')) + else: + steps=range(0, b+1, b/100) + steps.append(b) + indice=1 + written=0 + ncuts=b/bs + writeOvlap = win32file.OVERLAPPED() + writeOvlap.hEvent = win32event.CreateEvent(None, 0, 0, None) + writeOvlap.Offset = 0l + while ncuts <= 100: + bs=bs/2 + ncuts=b/bs + for i in xrange(0,ncuts+1): + try: + buf=ifc.read(bs) + except: + raise LiveUSBError(_("Reading error.")) + try: + win32file.WriteFile(ofc, buf, writeOvlap) + win32event.WaitForSingleObject(writeOvlap.hEvent, win32event.INFINITE) + writeOvlap.Offset = writeOvlap.Offset + bs + except: + raise LiveUSBError(_("Writing error or access denied ")+str(written)) + written= written+bs + if written > steps[indice]: + progress_thread.update(indice) + indice =indice+1 + try: + ofc.close() + except: + raise LiveUSBError(_("Writing error")) + ifc.close() + + def terminate(self): + """ Terminate any subprocesses that we have spawned """ + import win32api, win32con, pywintypes + for pid in self.pids: + try: + handle = win32api.OpenProcess(win32con.PROCESS_TERMINATE, + False, pid) + self.log.debug("Terminating process %s" % pid) + win32api.TerminateProcess(handle, -2) + win32api.CloseHandle(handle) + except pywintypes.error: + pass diff --git a/liveusb/gui.py b/liveusb/gui.py index 9de97e5..da85b9f 100755 --- a/liveusb/gui.py +++ b/liveusb/gui.py @@ -21,8 +21,6 @@ # Kushal Das <kushal@fedoraproject.org> # Aurelien Lefebvre <alefebvre@mandriva.com> -import os -import sys import logging from datetime import datetime @@ -105,8 +103,8 @@ class LiveUSBThread(QtCore.QThread): except LiveUSBError, e: self.status(e.message) - except Exception, e: - self.status(_("LiveUSB creation failed!")) +# except Exception, e: +# self.status(_("LiveUSB creation failed!")) def __del__(self): self.wait() @@ -188,10 +186,16 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): self.populate_devices) # If we have access to HAL & DBus, intercept some useful signals - if hasattr(self.live, 'hal'): - self.live.hal.connect_to_signal('DeviceAdded', +# if hasattr(self.live, 'hal'): +# self.live.i.connect_to_signal('DeviceAdded', +# self.populate_devices) +# self.live.hal.connect_to_signal('DeviceRemoved', +# self.populate_devices) + # If we have access to UDisk & DBus, intercept some useful signals + if hasattr(self.live, 'iface'): + self.live.iface.connect_to_signal('DeviceAdded', self.populate_devices) - self.live.hal.connect_to_signal('DeviceRemoved', + self.live.iface.connect_to_signal('DeviceRemoved', self.populate_devices) def progress(self, value): @@ -245,7 +249,7 @@ class LiveUSBDialog(QtGui.QDialog, LiveUSBInterface): try: self.live.set_iso(isofile) - except Exception, e: + except Exception as e: self.live.log.error(e.message.encode('utf8')) self.status(_("Unable to encode the filename of your livecd. " "You may have better luck if you move your ISO " diff --git a/liveusb/windows_dialog.py b/liveusb/windows_dialog.py index 1df259b..1762573 100644..100755 --- a/liveusb/windows_dialog.py +++ b/liveusb/windows_dialog.py @@ -71,7 +71,7 @@ class Ui_Dialog(object): QtCore.QMetaObject.connectSlotsByName(Dialog) def retranslateUi(self, Dialog): - Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", "usbdumper", None, QtGui.QApplication.UnicodeUTF8)) + Dialog.setWindowTitle(QtGui.QApplication.translate("Dialog", "Usbdumper", None, QtGui.QApplication.UnicodeUTF8)) self.startButton.setText(QtGui.QApplication.translate("Dialog", _("Create Live USB"), None, QtGui.QApplication.UnicodeUTF8)) self.groupBox.setTitle(QtGui.QApplication.translate("Dialog", _("Use existing Live CD"), None, QtGui.QApplication.UnicodeUTF8)) self.isoBttn.setText(QtGui.QApplication.translate("Dialog", _("Browse"), None, QtGui.QApplication.UnicodeUTF8)) @@ -34,7 +34,7 @@ if sys.platform == 'win32': setup( name = 'usbdumper', - version = '3.6.4', + version = '3.7.0', packages = ['liveusb'], scripts = ['usbdumper'], license = 'GNU General Public License (GPL)', @@ -42,8 +42,8 @@ if sys.platform == 'win32': description = 'This tool dumps hybrid ISO on USB stick', long_description = 'usbdumper is a cross-platform tool for easily dump hybrid ISO on USB flash drives', platforms = ['Windows'], - maintainer = 'Aurelien Lefebvre', - maintainer_email = 'alefebvre@mandriva.com', + maintainer = 'Yves Brungard', + maintainer_email = 'yves.brungard_mageia@gadz.org', windows = [ { "script" : "usbdumper", @@ -56,15 +56,12 @@ if sys.platform == 'win32': #"includes" : ["sip", "PyQt4._qt"], "includes" : ["sip"], 'bundle_files': 1, + "dll_excludes": ["mswsock.dll", "MSWSOCK.dll"], } }, zipfile=None, data_files = [ "LICENSE.txt", - ("tools", [ - "tools/dd.exe", - "tools/dd.exe.manifest", - ],) ] + [(os.path.join(LOCALE_DIR, locale), [os.path.join('po', 'locale', locale, 'liveusb-creator.mo')]) for locale in locales] @@ -72,16 +69,16 @@ if sys.platform == 'win32': else: setup( name = 'usbdumper', - version = '3.6.4', + version = '3.7.0', packages = ['liveusb'], scripts = ['usbdumper'], license = 'GNU General Public License (GPL)', - url = 'http://git.mandriva.com/?p=projects/mandriva-seed.git', + url = 'http://svnweb.mageia.org/soft/usbdumper', description = 'This tool dumps hybrid ISO on USB stick', long_description = 'usbdumper is a cross-platform tool for easily dump hybrid ISO on USB flash drives', platforms = ['Linux'], - maintainer = 'Aurelien Lefebvre', - maintainer_email = 'alefebvre@mandriva.com', + maintainer = 'Yves Brungard', + maintainer_email = 'yves.brungard_mageia@gadz.org', data_files = [("/usr/share/applications",["data/liveusb-creator.desktop"]), ('/usr/share/pixmaps',["data/fedorausb.png"]), ] + [(os.path.join(LOCALE_DIR, locale), diff --git a/tools/dd.exe b/tools/dd.exe Binary files differdeleted file mode 100644 index 47031e7..0000000 --- a/tools/dd.exe +++ /dev/null diff --git a/tools/dd.exe.manifest b/tools/dd.exe.manifest deleted file mode 100644 index 7e55ea5..0000000 --- a/tools/dd.exe.manifest +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> - <security> - <requestedPrivileges> - <requestedExecutionLevel - level="requireAdministrator" - uiAccess="False"/> - </requestedPrivileges> - </security> - </trustInfo> -</assembly>
\ No newline at end of file diff --git a/tools/dd.sh b/tools/dd.sh deleted file mode 100755 index f698a36..0000000 --- a/tools/dd.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -if [ $# -ne 2 ] -then - exit 1 -fi - -/bin/dd if=$1 of=$2 bs=8M & -pid=$! - -echo "DDPID=$pid" - -while true; -do - sleep 5 - kill -USR1 $pid 1>/dev/null 2>&1 - if [ $? -ne 0 ] - then - exit 0 - fi -done - -sync diff --git a/mandriva-seed b/usbdumper index 138bebc..00661a1 100755 --- a/mandriva-seed +++ b/usbdumper @@ -19,7 +19,7 @@ # Author(s): Luke Macken <lmacken@redhat.com> # Aurelien Lefebvre <alefebvre@mandriva.com> -__version__ = '3.6.4' +__version__ = '3.7.0' def parse_args(): from optparse import OptionParser |