Blame SOURCES/BZ-1270784-checksum-prefix.patch
|
 |
345e10 |
commit 0904d34bc9286b903b79f8fc42afc3f7cb63a9ad
|
|
|
345e10 |
Author: Valentina Mukhamedzhanova <vmukhame@redhat.com>
|
|
|
345e10 |
Date: Mon Jan 4 15:18:21 2016 +0100
|
|
|
345e10 |
|
|
|
345e10 |
Make sure filename doesn't already contain a checksum. BZ#1104840
|
|
|
345e10 |
|
|
|
345e10 |
diff --git a/createrepo/utils.py b/createrepo/utils.py
|
|
|
345e10 |
index b0d92ec..697728b 100644
|
|
|
345e10 |
--- a/createrepo/utils.py
|
|
|
345e10 |
+++ b/createrepo/utils.py
|
|
|
345e10 |
@@ -18,6 +18,7 @@
|
|
|
345e10 |
|
|
|
345e10 |
import os
|
|
|
345e10 |
import os.path
|
|
|
345e10 |
+import re
|
|
|
345e10 |
import sys
|
|
|
345e10 |
import bz2
|
|
|
345e10 |
import gzip
|
|
|
345e10 |
@@ -173,6 +174,9 @@ def checksum_and_rename(fn_path, sumtype='sha256'):
|
|
|
345e10 |
csum = misc.checksum(sumtype, fn_path)
|
|
|
345e10 |
fn = os.path.basename(fn_path)
|
|
|
345e10 |
fndir = os.path.dirname(fn_path)
|
|
|
345e10 |
+ fn_match = re.match(r'[0-9A-Fa-f]{32,128}-(.+)', fn)
|
|
|
345e10 |
+ if fn_match:
|
|
|
345e10 |
+ fn = fn_match.groups()[0]
|
|
|
345e10 |
csum_fn = csum + '-' + fn
|
|
|
345e10 |
csum_path = os.path.join(fndir, csum_fn)
|
|
|
345e10 |
os.rename(fn_path, csum_path)
|