aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdano Arendartchuk <bogdano@mandriva.org>2006-07-22 17:49:18 +0000
committerBogdano Arendartchuk <bogdano@mandriva.org>2006-07-22 17:49:18 +0000
commitfb8fd5b881fe0f019c4b497c5ea5c0c23f0e2f11 (patch)
tree044d85902bf221723b21169249b9ce749ce39e1a
parentee2b5e7f64cb80fceb88512510d47cd495d5aee1 (diff)
downloadmgarepo-fb8fd5b881fe0f019c4b497c5ea5c0c23f0e2f11.tar
mgarepo-fb8fd5b881fe0f019c4b497c5ea5c0c23f0e2f11.tar.gz
mgarepo-fb8fd5b881fe0f019c4b497c5ea5c0c23f0e2f11.tar.bz2
mgarepo-fb8fd5b881fe0f019c4b497c5ea5c0c23f0e2f11.tar.xz
mgarepo-fb8fd5b881fe0f019c4b497c5ea5c0c23f0e2f11.zip
- removed unnecessary repeated code in log code
-rw-r--r--RepSys/log.py15
1 files changed, 2 insertions, 13 deletions
diff --git a/RepSys/log.py b/RepSys/log.py
index d218c64..5b33c6e 100644
--- a/RepSys/log.py
+++ b/RepSys/log.py
@@ -285,20 +285,9 @@ def svn2rpm(pkgdirurl, rev=None, size=None, submit=False, template=None):
releases_data.sort()
for release_number, relentry, revinfo in releases_data:
- try:
- revinfo = parse_repsys_entry(relentry)
- except InvalidEntryError:
- continue
-
- try:
- release_revision = int(revinfo["revision"])
- except (ValueError, KeyError):
- raise Error, "Error parsing data from log entry from r%s" % \
- relentry.revision
-
# get entries newer than 'previous' and older than 'relentry'
entries = [entry for entry in currentlog
- if release_revision >= entry.revision and
+ if release_number >= entry.revision and
(previous_revision < entry.revision)]
if not entries:
#XXX probably a forced release, without commits in current/,
@@ -311,7 +300,7 @@ def svn2rpm(pkgdirurl, rev=None, size=None, submit=False, template=None):
lines=relentry.lines, entries=entries,
version=revinfo["version"], release=revinfo["release"])
releases.append(release)
- previous_revision = release_revision
+ previous_revision = release_number
# look for commits that have been not submited (released) yet
# this is done by getting all log entries newer (revision larger)