projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
codecheck: fix flake8 issues with versions >=3.8.3
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
867bea0
..
223dae2
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-503,6
+503,12
@@
def get_partition_for_path(path):
def check_boot_flag(device):
def check_boot_flag(device):
+ if os.path.isdir(device):
+ logging.debug(
+ "Device %s is a directory, skipping check for boot flag." % device
+ )
+ return
+
boot_dev, x = get_device_from_partition(device)
logging.info("Checking for boot flag")
boot_dev, x = get_device_from_partition(device)
logging.info("Checking for boot flag")
@@
-912,7
+918,7
@@
def mount(source, target, mount_options):
if x.startswith(source):
raise CriticalException(
(
if x.startswith(source):
raise CriticalException(
(
- "Error executing mount:
%s
already mounted - "
+ "Error executing mount:
{0}
already mounted - "
"please unmount before invoking grml2usb"
).format(source)
)
"please unmount before invoking grml2usb"
).format(source)
)
@@
-1881,10
+1887,6
@@
def install_grml(mountpoint, device):
register_tmpfile(device_mountpoint)
remove_device_mountpoint = True
try:
register_tmpfile(device_mountpoint)
remove_device_mountpoint = True
try:
- check_for_fat(device)
- if not options.skipbootflag:
- check_boot_flag(device)
-
set_rw(device)
mount(device, device_mountpoint, ["-o", "utf8,iocharset=iso8859-1"])
except CriticalException:
set_rw(device)
mount(device, device_mountpoint, ["-o", "utf8,iocharset=iso8859-1"])
except CriticalException:
@@
-1951,7
+1953,7
@@
def handle_mbr(device):
break
if not mbrcode:
break
if not mbrcode:
- str_locations = " or ".join(['"%s"' %
l for l
in mbr_locations])
+ str_locations = " or ".join(['"%s"' %
x for x
in mbr_locations])
logging.error("Cannot find syslinux MBR, install it at %s)", str_locations)
raise CriticalException(
"syslinux MBR can not be found at %s." % str_locations
logging.error("Cannot find syslinux MBR, install it at %s)", str_locations)
raise CriticalException(
"syslinux MBR can not be found at %s." % str_locations
@@
-2169,6
+2171,9
@@
def main():
# provide upgrade path
handle_compat_warning(device)
# provide upgrade path
handle_compat_warning(device)
+ if not options.skipbootflag:
+ check_boot_flag(device)
+
# check for vfat partition
handle_vfat(device)
# check for vfat partition
handle_vfat(device)