parent
f1d1d62469
commit
6f0a88203e
@ -1,28 +0,0 @@
|
|||||||
From e45c909235825f22e2ac7da63a4d6454399224e3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Patrick Uiterwijk <patrick@puiterwijk.org>
|
|
||||||
Date: Feb 20 2018 09:10:11 +0000
|
|
||||||
Subject: Fix comparison with Enum value
|
|
||||||
|
|
||||||
|
|
||||||
The CHECKSUM_TYPES[...] call returns the index in the Enum field, not a string,
|
|
||||||
which meant that the comparison would never work.
|
|
||||||
|
|
||||||
Reported-by: Clement Verna <cverna@tutanota.com>
|
|
||||||
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
diff --git a/hub/kojihub.py b/hub/kojihub.py
|
|
||||||
index eb9b67d..f910595 100644
|
|
||||||
--- a/hub/kojihub.py
|
|
||||||
+++ b/hub/kojihub.py
|
|
||||||
@@ -5581,7 +5581,7 @@ class CG_Importer(object):
|
|
||||||
(filesize, fileinfo['filename'], fileinfo['filesize']))
|
|
||||||
|
|
||||||
# checksum
|
|
||||||
- if koji.CHECKSUM_TYPES[fileinfo['checksum_type']] != 'md5':
|
|
||||||
+ if fileinfo['checksum_type'] != 'md5':
|
|
||||||
# XXX
|
|
||||||
# until we change the way we handle checksums, we have to limit this to md5
|
|
||||||
raise koji.GenericError("Unsupported checksum type: %(checksum_type)s" % fileinfo)
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
|||||||
diff -rup koji-1.15.0.orig/builder/kojid koji-1.15.0/builder/kojid
|
|
||||||
--- koji-1.15.0.orig/builder/kojid 2018-02-18 12:34:29.680250204 +0100
|
|
||||||
+++ koji-1.15.0/builder/kojid 2018-02-18 12:35:33.857177069 +0100
|
|
||||||
@@ -736,7 +736,10 @@ class BuildRoot(object):
|
|
||||||
# mock 1.4+ /tmp is tmpfs mounted on each run, different
|
|
||||||
# directory is needed for persistency
|
|
||||||
# 'within' is equivalent to broot.path_without_to_within(broot.tmpdir())
|
|
||||||
- base = "/builddir/tmp"
|
|
||||||
+ #
|
|
||||||
+ # *Note by puiterwijk*: This directory is "thebuilddir" rather than "Builddir"
|
|
||||||
+ # as it's in upstream koji to avoid upstream bug #808
|
|
||||||
+ base = "/thebuilddir/tmp"
|
|
||||||
if within:
|
|
||||||
return base
|
|
||||||
else:
|
|
Loading…
Reference in new issue