Patch to make pungi 3.03 respect the --nosource option
by Barry Scott
The attached patch has the changes I needed to make to prevent
pungi looking for .src.rpm files, which I believe is what the
--nosource option is intended to do.
I did not see this problem with the version of pungi shipped
with F19.
Barry
9 years, 7 months
[PATCH] Don't hardcode /var/lib/mock
by Mathieu Bridon
The builder configuration allows setting this to a different folder.
---
koji/daemon.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/koji/daemon.py b/koji/daemon.py
index fa22d5a..4f4b575 100644
--- a/koji/daemon.py
+++ b/koji/daemon.py
@@ -651,7 +651,7 @@ class TaskManager(object):
if id is None or name is None:
continue
# see if there's a dir for the buildroot
- vardir = "/var/lib/mock/%s" % name
+ vardir = os.path.join(self.options.mockdir, name)
#XXX
buildroots[id] = {}
buildroots[id]['name'] = name
--
1.8.4.2
9 years, 9 months
[PATCH v2] Add support for creating tarballs with scm data still inside
by Peter Jönsson
For some build systems the git information is required at build time
so we add an option to include the git data in the source tar
ball. Default is still to exclude vcs information if the tar
executable supports this option.
Signed-off-by: Peter Jönsson <peter.jonsson(a)klarna.com>
---
py/mockbuild/scm.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/py/mockbuild/scm.py b/py/mockbuild/scm.py
index 9d130b7..0178491 100644
--- a/py/mockbuild/scm.py
+++ b/py/mockbuild/scm.py
@@ -65,6 +65,7 @@ class scmWorker(object):
self.ext_src_dir = opts['ext_src_dir']
self.write_tar = opts['write_tar']
+ self.exclude_vcs = opts['exclude_vcs']
self.git_timestamps = opts['git_timestamps']
@@ -147,9 +148,11 @@ class scmWorker(object):
tarball = tardir + ".tar.gz"
taropts = ""
- proc = subprocess.Popen(['tar', '--help'], shell=False, stdout=subprocess.PIPE)
- if "--exclude-vcs" in proc.communicate()[0]:
- taropts = "--exclude-vcs"
+ # Always exclude vcs data from tarball unless told not to
+ if not str(self.exclude_vcs).lower() == "false":
+ proc = subprocess.Popen(['tar', '--help'], shell=False, stdout=subprocess.PIPE)
+ if "--exclude-vcs" in proc.communicate()[0]:
+ taropts = "--exclude-vcs"
self.log.debug("Writing " + self.src_dir + "/" + tarball + "...")
dir = os.getcwd()
--
1.9.0
9 years, 9 months
[PATCH] Add support for creating tarballs with scm data still inside
by Peter Jönsson
For some build systems the git information is required at build time
so we add an option to include the git data in the source tar
ball. Default is still to exclude vcs information if the tar
executable supports this option.
Signed-off-by: Peter Jönsson <peter.jonsson(a)klarna.com>
---
py/mockbuild/scm.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/py/mockbuild/scm.py b/py/mockbuild/scm.py
index 9d130b7..0178491 100644
--- a/py/mockbuild/scm.py
+++ b/py/mockbuild/scm.py
@@ -65,6 +65,7 @@ class scmWorker(object):
self.ext_src_dir = opts['ext_src_dir']
self.write_tar = opts['write_tar']
+ self.exclude_vcs = opts['exclude_vcs]'
self.git_timestamps = opts['git_timestamps']
@@ -147,9 +148,11 @@ class scmWorker(object):
tarball = tardir + ".tar.gz"
taropts = ""
- proc = subprocess.Popen(['tar', '--help'], shell=False, stdout=subprocess.PIPE)
- if "--exclude-vcs" in proc.communicate()[0]:
- taropts = "--exclude-vcs"
+ # Always exclude vcs data from tarball unless told not to
+ if not str(self.exclude_vcs).lower() == "false":
+ proc = subprocess.Popen(['tar', '--help'], shell=False, stdout=subprocess.PIPE)
+ if "--exclude-vcs" in proc.communicate()[0]:
+ taropts = "--exclude-vcs"
self.log.debug("Writing " + self.src_dir + "/" + tarball + "...")
dir = os.getcwd()
--
1.9.0
9 years, 9 months