diff options
| author | Jani Välimaa <wally@mageia.org> | 2024-03-24 12:10:52 +0200 |
|---|---|---|
| committer | Jani Välimaa <wally@mageia.org> | 2024-03-24 12:12:18 +0200 |
| commit | e94bc7af4eaf94116c931b97f4f09e9416fd4153 (patch) | |
| tree | b0a8e27246691d584a080cbb892d97081d8bba19 | |
| parent | b641599c2119bda54d0663becfdfb29eb25430a4 (diff) | |
| download | bm-e94bc7af4eaf94116c931b97f4f09e9416fd4153.tar bm-e94bc7af4eaf94116c931b97f4f09e9416fd4153.tar.gz bm-e94bc7af4eaf94116c931b97f4f09e9416fd4153.tar.bz2 bm-e94bc7af4eaf94116c931b97f4f09e9416fd4153.tar.xz bm-e94bc7af4eaf94116c931b97f4f09e9416fd4153.zip | |
Rename --clean as --clean-topdir
Reuse --clean later as passthough option for rpmbuild
| -rw-r--r-- | BuildManager/build.py | 4 | ||||
| -rw-r--r-- | bash-completion/bm | 2 | ||||
| -rw-r--r-- | bm | 4 | ||||
| -rw-r--r-- | man/bm.8 | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/BuildManager/build.py b/BuildManager/build.py index 38bde2f..5b7e7a5 100644 --- a/BuildManager/build.py +++ b/BuildManager/build.py @@ -120,7 +120,7 @@ class PackageBuilder: move_file(pkg.log, self.opts.move_log, dryrun=self.opts.dryrun) - if self.opts.clean or self.opts.clean_on_success: + if self.opts.clean_topdir or self.opts.clean_on_success: if pkg.builddir != "/": logger.info("cleaning build directory") if not self.opts.dryrun: @@ -144,7 +144,7 @@ class PackageBuilder: move_file(pkg.log, self.opts.move_failed_log, dryrun=self.opts.dryrun) - if self.opts.clean: + if self.opts.clean_topdir: if pkg.builddir != "/": logger.info("cleaning build directory") if not self.opts.dryrun: diff --git a/bash-completion/bm b/bash-completion/bm index feb2c18..047a8fd 100644 --- a/bash-completion/bm +++ b/bash-completion/bm @@ -33,7 +33,7 @@ _bm() --remove-failed-srpm --move-succeeded-srpm= \ --copy-succeeded-srpm= --remove-succeeded-srpm \ --move-log= --move-failed-log= --filter-renew= \ - --filter-refresh= --clean --clean-on-success --ignore= \ + --filter-refresh= --clean-topdir --clean-on-success --ignore= \ --sign --nodeps --noclean --debug --short-circuit --with \ --without --define --target --dryrun --log=' -- $cur ) ) else @@ -78,10 +78,10 @@ def parse_options(): help="don't build packages if a newer version exists in given directory") parser.add_option("--filter-refresh", metavar="DIR", action="append", default=[], help="only build packages if an older version exists in given directory") - parser.add_option("--clean", action="store_true", + parser.add_option("--clean-topdir", action="store_true", help="recursively remove directory used as topdir after the build process") parser.add_option("--clean-on-success", action="store_true", - help="same as --clean, but only remove if build has succeeded") + help="same as --clean-topdir, but only remove if build has succeeded") parser.add_option("--ignore", metavar="PKGNAME", action="append", default=[], help="ignore given package names (shell globbing allowed)") parser.add_option("--force-unpack", dest="forceunpack", action="store_true", @@ -113,12 +113,12 @@ don't build packages if a newer version exists in given directory only build packages if an older version exists in given directory .TP .B -\fB--clean\fP +\fB--clean-topdir\fP recursively remove directory used as topdir after the build process .TP .B \fB--clean-on-success\fP -same as \fB--clean\fP, but only remove if build has succeeded +same as \fB--clean-topdir\fP, but only remove if build has succeeded .TP .B \fB--ignore\fP=PKGNAME |