imxyy1soope1/nixos-dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Activity

noctalia: fix sync-noctalia skipping new sections when no other changes

Browse Source
This commit is contained in:
imxyy1soope1
2026-08-30 12:03:44 +08:00
parent 818c9f6af8
commit 0d6deec01e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/sync-noctalia.py
+7 -4
View File
@@ -406,7 +406,7 @@ def main():
else: else:
sets_by_file.setdefault(f, []).append((path, old, val)) sets_by_file.setdefault(f, []).append((path, old, val))
if not changes: if not changes and not new_files:
print("No changes to fold. Repo config already matches the export.") print("No changes to fold. Repo config already matches the export.")
return return
@@ -434,8 +434,10 @@ def main():
) )
if not args.apply: if not args.apply:
total = len(changes) + len(new_files)
file_count = len(touched) + len(new_files)
print( print(
f"\n{len(changes)} change{'s' if len(changes) > 1 else ''} in {len(touched)} file(s)." f"\n{total} change{'s' if total != 1 else ''} in {file_count} file(s)."
) )
print("Run with --apply to fold into the repo.") print("Run with --apply to fold into the repo.")
return return
@@ -478,10 +480,11 @@ def main():
print(f" backed up {state_dir}/settings.toml -> {bak}") print(f" backed up {state_dir}/settings.toml -> {bak}")
reload_instance() reload_instance()
else: else:
# Should not reach this branch, since `len(changes) > 0`, GUI overrides must exist. # Should not reach this branch, since a fold implies GUI overrides exist.
print("warning: settings.toml does not exist. Nothing backuped") print("warning: settings.toml does not exist. Nothing backuped")
print(f"\nDone. {len(changes)} change{'s' if len(changes) > 1 else ''} folded.") total = len(changes) + len(new_files)
print(f"\nDone. {total} change{'s' if total != 1 else ''} folded.")
if __name__ == "__main__": if __name__ == "__main__":