data/liveusb-creator.nsi | 17 +++++++++++------
liveusb-creator | 2 +-
liveusb/creator.py | 9 +++++++--
release.bat | 2 +-
4 files changed, 20 insertions(+), 10 deletions(-)
New commits:
commit 3477d72fb9168c09c8c8c771f894440af3287526
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Jan 21 11:20:46 2011 -0500
3.9.4
diff --git a/data/liveusb-creator.nsi b/data/liveusb-creator.nsi
index b3909b9..5e75de9 100644
--- a/data/liveusb-creator.nsi
+++ b/data/liveusb-creator.nsi
@@ -1,5 +1,5 @@
-Name "LiveUSB Creator 3.9.3"
-OutFile "liveusb-creator-3.9.3-setup.exe"
+Name "LiveUSB Creator 3.9.4"
+OutFile "liveusb-creator-3.9.4-setup.exe"
SetCompressor lzma
diff --git a/liveusb-creator b/liveusb-creator
index f543d25..d427a58 100755
--- a/liveusb-creator
+++ b/liveusb-creator
@@ -18,7 +18,7 @@
#
# Author(s): Luke Macken <lmacken(a)redhat.com>
-__version__ = '3.9.3'
+__version__ = '3.9.4'
def parse_args():
from optparse import OptionParser
commit c8264176e65b41344cd18199e3039f3164dd04c9
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Jan 21 11:19:40 2011 -0500
Catch pywintypes.com_error Exceptions in our is_admin method.
diff --git a/liveusb/creator.py b/liveusb/creator.py
index 257ccd1..604d696 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -1141,5 +1141,10 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
self.popen('format /Q /X /y /V:Fedora /FS:FAT32 %s' % self.drive['device'])
def is_admin(self):
- from win32com.shell import shell
- return shell.IsUserAnAdmin()
+ import pywintypes
+ try:
+ from win32com.shell import shell
+ return shell.IsUserAnAdmin()
+ except pywintypes.com_error:
+ # Thrown on certain XP installs
+ return True
commit b561ca9230155667372fe9e497e6e8ec2c35b9ea
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Jan 21 10:57:05 2011 -0500
Install the Microsoft Visual C++ Redistributable Package from from our installer, if necessary.
This fixes ticket [ticket:793]
diff --git a/data/liveusb-creator.nsi b/data/liveusb-creator.nsi
index 710b650..b3909b9 100644
--- a/data/liveusb-creator.nsi
+++ b/data/liveusb-creator.nsi
@@ -16,11 +16,18 @@ Section ""
SetOverwrite on
SetOutPath $INSTDIR
+
+ File vcredist_x86.exe
+ IfFileExists "$WINDIR\WinSxS\x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375" vcredist_install_finished vcredist_silent_install
+ vcredist_silent_install:
+ DetailPrint "Installing the Microsoft Visual C++ 2008 Redistributable Package"
+ ExecWait '"$INSTDIR\vcredist_x86.exe" /q'
+ vcredist_install_finished:
+ Delete "$INSTDIR\vcredist_x86.exe"
+
File liveusb-creator.exe
File LICENSE.txt
File README.txt
- File MSVCP90.DLL
- File MSVCR90.dll
File w9xpopen.exe
SetOutPath $INSTDIR\tools
@@ -69,8 +76,6 @@ Section Uninstall
Delete "$INSTDIR\liveusb-creator.exe"
Delete "$INSTDIR\LICENSE.txt"
Delete "$INSTDIR\README.txt"
- Delete "$INSTDIR\MSVCP90.DLL"
- Delete "$INSTDIR\MSVCR90.dll"
Delete "$INSTDIR\w9xpopen.exe"
Delete "$INSTDIR\tools\7z.dll"
diff --git a/release.bat b/release.bat
index 5b90f5f..6e6290f 100644
--- a/release.bat
+++ b/release.bat
@@ -5,9 +5,9 @@ echo Generating an exe of the liveusb-creator %1
del /Q dist
del /Q build
python -OO setup.py py2exe
-copy *.dll dist
copy README.txt dist
copy data\fedora.ico dist\liveusb-creator.ico
+copy data\vcredist_x86.exe dist
copy data\liveusb-creator.nsi dist\liveusb-creator.nsi
"C:\Program Files\NSIS\makensis.exe" dist\liveusb-creator.nsi
rename dist liveusb-creator-%1