diff options
| author | Jani Välimaa <wally@mageia.org> | 2024-03-23 15:36:04 +0200 |
|---|---|---|
| committer | Jani Välimaa <wally@mageia.org> | 2024-03-23 15:50:45 +0200 |
| commit | ff00af5ff1757657e720a251ce402e767a484395 (patch) | |
| tree | c556a11628fd3d304f70a8efb726738f99055356 | |
| parent | 7ac3b0ede501838d0bba3ee80fa005312addb53e (diff) | |
| download | bm-ff00af5ff1757657e720a251ce402e767a484395.tar bm-ff00af5ff1757657e720a251ce402e767a484395.tar.gz bm-ff00af5ff1757657e720a251ce402e767a484395.tar.bz2 bm-ff00af5ff1757657e720a251ce402e767a484395.tar.xz bm-ff00af5ff1757657e720a251ce402e767a484395.zip | |
Pass --nodeps by default to rpmbuild if running only %prep stage
| -rw-r--r-- | BuildManager/build.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/BuildManager/build.py b/BuildManager/build.py index d8762c5..daf2b24 100644 --- a/BuildManager/build.py +++ b/BuildManager/build.py @@ -203,8 +203,12 @@ def buildpkg(pkg, stage, unpack_dir, passtrough="", show_log=0, dryrun=0): tmppath = " --define '_tmppath %s/BUILDROOT'" % pkg.builddir else: tmppath = "" - cmd = "rpmbuild -b%s --define '_topdir %s'%s %s %s 2>&1" % \ - (stagechar,pkg.builddir,tmppath,passtrough,pkg.spec) + if stage == STAGE_PREP: + nodeps = "--nodeps" + else: + nodeps = "" + cmd = "rpmbuild -b%s %s --define '_topdir %s'%s %s %s 2>&1" % \ + (stagechar,nodeps,pkg.builddir,tmppath,passtrough,pkg.spec) logger.debug("rpmbuild command: "+cmd) if not dryrun: log = codecs.open(pkg.log, "w", 'utf-8', errors = "replace") |