Merge remote-tracking branch 'origin/master' into tarball-safe

WoeUSB · Feb 6, 2021 · d2df5c4 · d2df5c4
2 parents 5d2a1bd + 642ecb1
commit d2df5c4
Show file tree

Hide file tree

Showing 7 changed files with 546 additions and 7 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,3 +2,4 @@ graft WoeUSB/data
 graft WoeUSB/locale
 graft miscellaneous
 include README.md
+include WoeUSB/woeusbgui
diff --git a/WoeUSB/core.py b/WoeUSB/core.py
@@ -9,6 +9,7 @@
 import threading
 import subprocess
 import urllib.request
+import urllib.error
 from datetime import datetime
 
 import WoeUSB.utils as utils
@@ -373,7 +374,7 @@ def install_uefi_ntfs_support_partition(uefi_ntfs_partition, download_directory)
 
     try:
         file = urllib.request.urlretrieve("https://github.com/pbatard/rufus/raw/master/res/uefi/", "uefi-ntfs.img")[0]
-    except urllib.request.ContentTooShortError:
+    except (urllib.error.ContentTooShortError, urllib.error.HTTPError, urllib.error.URLError):
         utils.print_with_color(
             _("Warning: Unable to download UEFI:NTFS partition image from GitHub, installation skipped.  Target device might not be bootable if the UEFI firmware doesn't support NTFS filesystem."), "yellow")
         return 1

diff --git a/WoeUSB/locale/pt_BR/LC_MESSAGES/woeusb.mo b/WoeUSB/locale/pt_BR/LC_MESSAGES/woeusb.mo