diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-02-09 15:32:39 +0100 |
|---|---|---|
| committer | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2024-02-15 12:11:07 +0100 |
| commit | 7967b70159ccf330c38e8bdd73cdafafe6dc0cf2 (patch) | |
| tree | f47cdb3e4c0dcbb3afd3e4fc9563b4d6bf007ab9 /sources/pyside-tools/project/utils.py | |
| parent | b930d88c7341ebefdca2dfc206fd7f747cdf5e11 (diff) | |
pyside6-project: Fix --dry-run
Bug caused from 10715102f01bfee9c0122f21680f05414a947357
Pick-to: 6.6 6.5
Change-Id: I50631239134f154baebab0eef4d36c52e8ba398b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside-tools/project/utils.py')
| -rw-r--r-- | sources/pyside-tools/project/utils.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sources/pyside-tools/project/utils.py b/sources/pyside-tools/project/utils.py index b3fd03584..d2bff65af 100644 --- a/sources/pyside-tools/project/utils.py +++ b/sources/pyside-tools/project/utils.py @@ -6,14 +6,15 @@ import subprocess from pathlib import Path from typing import List, Dict, Optional -from . import opt_dry_run, opt_quiet, QTPATHS_CMD, PROJECT_FILE_SUFFIX +from . import QTPATHS_CMD, PROJECT_FILE_SUFFIX, ClOptions def run_command(command: List[str], cwd: str = None, ignore_fail: bool = False): """Run a command observing quiet/dry run""" - if not opt_quiet or opt_dry_run: + cloptions = ClOptions() + if not cloptions.quiet or cloptions.dry_run: print(" ".join(command)) - if not opt_dry_run: + if not cloptions.dry_run: ex = subprocess.call(command, cwd=cwd) if ex != 0 and not ignore_fail: sys.exit(ex) @@ -42,11 +43,12 @@ def _remove_path_recursion(path: Path): def remove_path(path: Path): """Remove path (file or directory) observing opt_dry_run.""" + cloptions = ClOptions() if not path.exists(): return - if not opt_quiet: + if not cloptions.quiet: print(f"Removing {path.name}...") - if opt_dry_run: + if cloptions.dry_run: return _remove_path_recursion(path) |