From 1e59edf6d0b463075979a7852d7182e59d9cb2de Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Jul 29 2009 03:41:20 +0000 Subject: - Fix the patch in -4 --- diff --git a/0002-Temporary-workaround-for-accidentially-re-downloadin.patch b/0002-Temporary-workaround-for-accidentially-re-downloadin.patch index 1f3a4a5..5030ffc 100644 --- a/0002-Temporary-workaround-for-accidentially-re-downloadin.patch +++ b/0002-Temporary-workaround-for-accidentially-re-downloadin.patch @@ -1,4 +1,4 @@ -From a94667940ac9523b8132f9c003a8f4b4fab6b7af Mon Sep 17 00:00:00 2001 +From 32d4a140dc9a8d18604386ba08de911bef34c8f0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 28 Jul 2009 20:06:30 -0700 Subject: [PATCH 2/2] Temporary workaround for accidentially re-downloading stale rpms. @@ -11,18 +11,18 @@ to me by Mitr. 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/bridge.py b/src/bridge.py -index 15f6422..4bda697 100644 +index 15f6422..32343ed 100644 --- a/src/bridge.py +++ b/src/bridge.py -@@ -309,7 +309,7 @@ class SignRpmRequestType(RequestType): +@@ -331,7 +331,7 @@ class SignRpmRequestType(RequestType): # attempts to initialize nss with our certificate database. import koji -- if self.__koji_session is None: +- if self.__koji_rpm_info is None: + if True: try: - self.__koji_config = utils.koji_read_config() - # self.__request_fields['user'] safety was verified by + d = {'name': self.__request_fields['rpm-name'], + 'version': self.__request_fields['rpm-version'], -- 1.6.2.5 diff --git a/sigul.spec b/sigul.spec index 4dbafeb..3d2b3c1 100644 --- a/sigul.spec +++ b/sigul.spec @@ -1,7 +1,7 @@ Summary: A signing server and related software client Name: sigul Version: 0.96 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Applications/Internet URL: https://fedorahosted.org/sigul/ @@ -96,6 +96,9 @@ fi %dir %attr(700,sigul,sigul) %{_localstatedir}/lib/sigul/gnupg %changelog +* Tue Jul 28 2009 Jesse Keating - 0.96-6 +- Fix the patch in -4 + * Tue Jul 28 2009 Jesse Keating - 0.96-5 - Add a dist tag