Veuillez saisir le message de validation pour vos modifications. Les lignes

 commençant par '' seront ignorées, et un message vide abandonne la validation.

 Sur la branche less-deps-feature-win-tweaks
 Votre branche est à jour avec 'origin/less-deps-feature-win-tweaks'.

 Modifications qui seront validées :
	modifié :         scripts/build-appimage.sh
	modifié :         src/lufus/drives/formatting.py
	modifié :         src/lufus/gui/i18n.py
	modifié :         src/lufus/utils.py
	modifié :         src/lufus/writing/flash_usb.py
	modifié :         tests/test_flash_usb_and_find_usb_fixes.py

Author: R-Larocque

scripts/build-appimage.sh

@@ -5,7 +5,6 @@ ls -la
 
 # Install system dependencies
 echo "------------ Installing system libraries ------------"
-apt-get update && apt-get upgrade -y
 INSTALLER="apt-get install -y"
 if [[ -f requirements-system.txt ]]; then
     $INSTALLER $(cat requirements-system.txt) >> appimage-setup.log

src/lufus/drives/formatting.py

@@ -104,11 +104,16 @@ def unmount(drive: str = None) -> bool:
 def remount(drive: str = None) -> bool:
     if not drive:
         mount, drive, _ = _get_mount_and_drive()
+    else:
+        # Look up mount point for the specified drive
+        from lufus.drives.find_usb import find_usb
+        mount_dict = find_usb()
+        mount = mount_dict.get(drive)
     if not drive:
         log.error("No drive node found. Cannot unmount.")
         return False
-    if not drive or not mount:
-        log.error("No drive node or mount point found. Cannot remount.")
+    if not mount:
+        log.error("No mount point found for drive %s. Cannot remount.", drive)
         return False
     log.info("Remounting %s -> %s...", drive, mount)
     try:

src/lufus/gui/i18n.py

@@ -11,8 +11,12 @@ def load_translations(language="English"):
         return t
     lang_file = lang_dir / f"{language}.csv"
     if lang_file.exists():
-        # read translations from csv :3
-        with open(lang_file, encoding="utf-8", newline="") as f:
+        # utf-8-sig strips BOM that some editors insert before the first byte.
+        # Graceful row handling: skip malformed rows (no key column, empty key).
+        with open(lang_file, encoding="utf-8-sig", newline="") as f:
             for row in csv.DictReader(f):
-                t[row["key"]] = row["value"]
+                key = row.get("key", "").strip()
+                value = row.get("value", "").strip()
+                if key:
+                    t[key] = value
     return t

src/lufus/utils.py

@@ -13,7 +13,11 @@ def elevate_privileges() -> None:
     # if the app was able to find them before elevation.
     env = os.environ.copy()
     if state.theme:
-        env["LUFUS_THEME"] = state.theme
+        # Validate theme is a safe filename/path: no path separators, no "..",
+        # and must be a basic filename to prevent path traversal.
+        theme = os.path.basename(state.theme)
+        if theme and theme == state.theme and ".." not in theme:
+            env["LUFUS_THEME"] = theme
 
     # Preserve DISPLAY and XAUTHORITY for GUI apps under pkexec/sudo
     env_vars = ["DISPLAY", "XAUTHORITY", "XDG_RUNTIME_DIR", "WAYLAND_DISPLAY", "PYTHONPATH", "LUFUS_THEME"]

src/lufus/writing/flash_usb.py

@@ -124,6 +124,12 @@ def _status(msg: str) -> None:
         while True:
             chunk = process.stderr.read1(65536)
             if not chunk:
+                # Flush any remaining partial stderr fragment so it is not lost
+                if buf:
+                    decoded = buf.decode(errors="replace").rstrip("\r\n")
+                    if decoded:
+                        # Log at info to avoid alarming users with benign dd output
+                        log.info("dd stderr (final fragment): %s", decoded)
                 break
             buf += chunk
             segments = re.split(rb"[\r\n]", buf)
@@ -155,7 +161,7 @@ def _status(msg: str) -> None:
                     # dd bookkeeping lines — informational only, not progress events
                     pass
                 else:
-                    log.warning("dd stderr: %s", line_str)
+                    log.info("dd stderr: %s", line_str)
 
         process.wait()
         _status(f"dd process exited with return code {process.returncode}")

tests/test_flash_usb_and_find_usb_fixes.py

@@ -385,9 +385,11 @@ def test_progress_cb_receives_milestones_and_scaled_dd_progress(self, monkeypatc
         progress_values = []
         status_messages = []
 
-        def progress_cb(progress, status):
+        def progress_cb(progress):
             progress_values.append(progress)
-            status_messages.append(status)
+
+        def status_cb(message):
+            status_messages.append(message)
 
         stderr_lines = [
             "0+0 records in\n",
@@ -429,9 +431,9 @@ def progress_cb(progress, status):
         assert env.get("LC_ALL") == "C"
         assert dict(os.environ) == original_environ
 
-        # progress_cb should have the early 0.0 milestone, then scaled values
-        assert progress_values[0] == 0.0
-        assert progress_values[-1] == 1.0
+        # progress_cb should have the early 0 milestone, then scaled values
+        assert progress_values[0] == 0
+        assert progress_values[-1] == 100
         assert sorted(progress_values) == progress_values
 
         # Status messages should contain the raw dd progress lines
@@ -443,9 +445,11 @@ def test_non_progress_and_unexpected_stderr_lines_handling(self, monkeypatch, ca
         progress_values = []
         status_messages = []
 
-        def progress_cb(progress, status):
+        def progress_cb(progress):
             progress_values.append(progress)
-            status_messages.append(status)
+
+        def status_cb(message):
+            status_messages.append(message)
 
         stderr_lines = [
             "1+0 records in\n",
@@ -469,18 +473,18 @@ def progress_cb(progress, status):
             f.write(b"\x00" * 100)
             iso_path = f.name
 
-        with caplog.at_level("WARNING", logger="lufus"):
+        with caplog.at_level("INFO", logger="lufus"):
             try:
-                flash_usb_module.flash_usb("/dev/sdb", iso_path, progress_cb=progress_cb)
+                flash_usb_module.flash_usb("/dev/sdb", iso_path, progress_cb=progress_cb, status_cb=status_cb)
             finally:
                 os.unlink(iso_path)
 
-        # Only the initial 0.0 milestone should be present;
+        # Only the initial 0 milestone should be present;
         # bookkeeping lines must not trigger additional progress_cb calls
-        assert progress_values == [0.0]
+        assert progress_values == [0]
 
-        # Unexpected stderr lines must surface as warnings
+        # Non-progress stderr lines now log at info level
         unexpected_logs = [
             record for record in caplog.records if "some unexpected warning from dd" in record.getMessage()
         ]
-        assert unexpected_logs, "Unexpected stderr lines should produce a warning log entry"
+        assert unexpected_logs, "Unexpected stderr lines should produce an info log entry"