[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: fix strip_epoch() where I silly assume epochs can only have one or two digits

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 8ad939daa6614c68bef9625939f05f539d26e029
Author: Mattia Rizzolo <mattia at mapreri.org>
Date:   Tue Mar 24 10:29:26 2015 +0100

    reproducible: fix strip_epoch() where I silly assume epochs can only have one or two digits
---
 TODO                       | 1 -
 bin/reproducible_common.py | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/TODO b/TODO
index 7cececa..06cfb3e 100644
--- a/TODO
+++ b/TODO
@@ -122,7 +122,6 @@ properties:
 *** there are still some with this failure (in sid+jessie), appearantly caused by #781076, currently unfixed
 ** find out why fonts-sil-gentium leaves not rbuild.log and no .buildinfo file and whether there are others like this
 *** .buildinfo file and rbuild.log were created and exist on the filesystem
-*** the bug is in strip_epoch() in _common.py which assume epochs are single digit...
 ** find debbindiff problems: rgrep -l "maybe there is still " /var/lib/jenkins/userContent/rbuild/
 ** reproducible: dont delete userContent/$pkg on build begin..
 ** move all content into /var/lib/userContent/reproducible/
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index d032636..8df5e26 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -351,14 +351,9 @@ def strip_epoch(version):
     """
     Stip the epoch out of the version string. Some file (e.g. buildlogs, debs)
     do not have epoch in their filenames.
-    This recognize a epoch if there is a colon in the second or third character
-    of the version.
     """
     try:
-        if version[1] == ':' or version[2] == ':':
-            return version.split(':', 1)[1]
-        else:
-            return version
+        return version.split(':', 1)[1]
     except IndexError:
         return version
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git