From 8ad939daa6614c68bef9625939f05f539d26e029 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Tue, 24 Mar 2015 10:29:26 +0100 Subject: 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 7cececa7..06cfb3ef 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 d032636a..8df5e267 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 -- cgit v1.2.3-70-g09d2