aboutsummaryrefslogtreecommitdiffstats
path: root/RepSys/log.py
diff options
context:
space:
mode:
authorBogdano Arendartchuk <bogdano@mandriva.org>2007-01-29 18:14:56 +0000
committerBogdano Arendartchuk <bogdano@mandriva.org>2007-01-29 18:14:56 +0000
commita493be252f25b57767023930d4ed927b37816e71 (patch)
treee25eb71eba2146cac6dd8dc4bbb4b7c043d65076 /RepSys/log.py
parentd4d9914ec004a9ad1b767bc177d45af6694080be (diff)
downloadmgarepo-a493be252f25b57767023930d4ed927b37816e71.tar
mgarepo-a493be252f25b57767023930d4ed927b37816e71.tar.gz
mgarepo-a493be252f25b57767023930d4ed927b37816e71.tar.bz2
mgarepo-a493be252f25b57767023930d4ed927b37816e71.tar.xz
mgarepo-a493be252f25b57767023930d4ed927b37816e71.zip
Removed bogus macros files and added [macros ..] sections to repsys.conf.
These sections are referenced by the "rpm-macros" option in [submit ..] sections and contain the RPM macros to be used with the target of the package being generated. These macros are defined using --define option of rpm.
Diffstat (limited to 'RepSys/log.py')
-rw-r--r--RepSys/log.py36
1 files changed, 8 insertions, 28 deletions
diff --git a/RepSys/log.py b/RepSys/log.py
index 6d7bde0..3645fdd 100644
--- a/RepSys/log.py
+++ b/RepSys/log.py
@@ -42,13 +42,14 @@ default_template = """
#end for
"""
-def getrelease(pkgdirurl, rev=None):
+def getrelease(pkgdirurl, rev=None, macros=[]):
"""Tries to obtain the version-release of the package for a
yet-not-markrelease revision of the package.
Is here where things should be changed if "automatic release increasing"
will be used.
"""
+ from RepSys.rpmutil import rpm_macros_defs
svn = SVN(baseurl=pkgdirurl)
tmpdir = tempfile.mktemp()
try:
@@ -60,9 +61,7 @@ def getrelease(pkgdirurl, rev=None):
found = glob.glob(os.path.join(tmpdir, "*.spec"))
if found:
specpath = found[0]
- fmt = "--define \"%s %s\""
- macros = (fmt % macro for macro in parse_macros())
- options = " ".join(macros)
+ options = rpm_macros_defs(macros)
command = (("rpm -q --qf '%%{VERSION}-%%{RELEASE}\n' "
"--specfile %s %s 2>/dev/null") %
(specpath, options))
@@ -80,26 +79,6 @@ def getrelease(pkgdirurl, rev=None):
if os.path.isdir(tmpdir):
shutil.rmtree(tmpdir)
-
-def parse_macros():
- path = config.get("log", "macros-file", None)
- if not path:
- # if the user did not declated where is the file, ignore it
- return
- if not os.path.isfile(path):
- # complain when declared and not found
- sys.stderr.write("warning: could not open macros file: %s\n" %
- path)
- return
- for line in open(path):
- line = line.strip()
- if line.startswith("#") or not line:
- continue
- name, value = line.split(None, 1)
- # trying to have the same format from rpm macros files
- name = name[1:]
- yield (name, value)
-
class _Revision:
lines = []
date = None
@@ -331,7 +310,8 @@ def parse_markrelease_log(relentry):
return version, release, from_rev
-def svn2rpm(pkgdirurl, rev=None, size=None, submit=False, template=None):
+def svn2rpm(pkgdirurl, rev=None, size=None, submit=False,
+ template=None, macros=[]):
concat = config.get("log", "concat", "").split()
revoffset = get_revision_offset()
svn = SVN(baseurl=pkgdirurl)
@@ -394,7 +374,7 @@ def svn2rpm(pkgdirurl, rev=None, size=None, submit=False, template=None):
if notsubmitted:
# if they are not submitted yet, what we have to do is to add
# a release/version number from getrelease()
- version, release = getrelease(pkgdirurl)
+ version, release = getrelease(pkgdirurl, macros=macros)
toprelease = make_release(entries=notsubmitted, released=False,
version=version, release=release)
releases.append(toprelease)
@@ -405,7 +385,7 @@ def svn2rpm(pkgdirurl, rev=None, size=None, submit=False, template=None):
def specfile_svn2rpm(pkgdirurl, specfile, rev=None, size=None,
- submit=False, template=None):
+ submit=False, template=None, macros=[]):
newlines = []
found = 0
@@ -422,7 +402,7 @@ def specfile_svn2rpm(pkgdirurl, specfile, rev=None, size=None,
# Create new changelog
newlines.append("\n\n%changelog\n")
newlines.append(svn2rpm(pkgdirurl, rev=rev, size=size, submit=submit,
- template=template))
+ template=template, macros=macros))
# Merge old changelog, if available
oldurl = config.get("log", "oldurl")