diff options
author | Mattia Rizzolo <mattia@mapreri.org> | 2015-03-24 10:29:26 +0100 |
---|---|---|
committer | Holger Levsen <holger@layer-acht.org> | 2015-03-24 10:46:44 +0100 |
commit | 8ad939daa6614c68bef9625939f05f539d26e029 (patch) | |
tree | 6b54146c654ed95154c72e8a3cfa6a24bdbc3f3e | |
parent | f1ad65af1c6e4b72f014549b8e8f47e589bcaa16 (diff) | |
download | jenkins.debian.net-8ad939daa6614c68bef9625939f05f539d26e029.tar.xz |
reproducible: fix strip_epoch() where I silly assume epochs can only have one or two digits
-rw-r--r-- | TODO | 1 | ||||
-rwxr-xr-x | bin/reproducible_common.py | 7 |
2 files changed, 1 insertions, 7 deletions
@@ -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 |