geronzi/full_updater
2
0
Fork 0
Code Issues Pull requests Projects Releases 27 Packages Wiki Activity Actions

fix(os): use NAME directly, avoid double 'GNU/Linux'
All checks were successful
Build and Release .deb / build-deb (push) Successful in 21s
Details

Browse source 
- NAME already contains 'Debian GNU/Linux', don't append it again
- With DEBIAN_VERSION_FULL: NAME + DEBIAN_VERSION_FULL + (codename)
- Without: NAME + VERSION_ID + (codename)
- Fixes duplication bug
This commit is contained in:
enzo 2026-05-13 04:15:57 +02:00
parent c1f462d209
commit 721e677fa6
1 changed files with 13 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

39
full_updater/backend/scanner.py
View file

@ -148,40 +148,27 @@ def scan_os(target: Target) -> str:
line = line.strip() line = line.strip()
if "=" in line: if "=" in line:
key, val = line.split("=", 1) key, val = line.split("=", 1)
# Supprimer les guillemets
val = val.strip().strip('"').strip("'") val = val.strip().strip('"').strip("'")
os_data[key] = val os_data[key] = val
# 2. Extraire les champs # 2. Extraire les champs
version_id = os_data.get("DEBIAN_VERSION_FULL", "") name = os_data.get("NAME", "")
if not version_id: codename = os_data.get("VERSION_CODENAME", "")
version_id = os_data.get("VERSION", "") debian_version_full = os_data.get("DEBIAN_VERSION_FULL", "")
if not version_id:
version_id = os_data.get("VERSION_ID", "") version_id = os_data.get("VERSION_ID", "")
codename = os_data.get("VERSION_CODENAME", "") # 3. Construire le libellé final
pretty_name = os_data.get("PRETTY_NAME", "") # Avec DEBIAN_VERSION_FULL : NAME DEBIAN_VERSION_FULL (VERSION_CODENAME)
os_name = os_data.get("NAME", "") # Sans : NAME VERSION_ID (VERSION_CODENAME)
version = debian_version_full if debian_version_full else version_id
# 3. Fallback sur /etc/debian_version si tout vide if name and version and codename:
if not version_id: return f"{name} {version} ({codename})"
ok, ver_out, _ = run_cmd(prefix + ["cat", "/etc/debian_version"], timeout=30) if name and version:
version_id = ver_out.strip() if ok else "" return f"{name} {version}"
# 4. Fallback sur lsb_release pour le nom # Fallback : PRETTY_NAME ou "OS inconnu"
if not os_name: return os_data.get("PRETTY_NAME", "OS inconnu")
ok, name_out, _ = run_cmd(prefix + ["lsb_release", "-is"], timeout=30)
os_name = name_out.strip() if ok else ""
if not os_name and pretty_name:
return pretty_name
if not os_name or not version_id:
return pretty_name if pretty_name else "OS inconnu"
# Construire le libellé final
if codename:
return f"{os_name} GNU/Linux {version_id} ({codename})"
return f"{os_name} GNU/Linux {version_id}"
def ensure_debsecan_installed(is_host: bool, vmid: str = "") -> tuple[bool, str]: def ensure_debsecan_installed(is_host: bool, vmid: str = "") -> tuple[bool, str]: