rpms/sigul/EL-5 0002-Temporary-workaround-for-accidentially-re-downloadin.patch, 1.1, 1.2 sigul.spec, 1.2, 1.3

[Jesse Keating]

Author: jkeating

Update of /cvs/pkgs/rpms/sigul/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31024

Modified Files:
	0002-Temporary-workaround-for-accidentially-re-downloadin.patch 
	sigul.spec 
Log Message:
* Tue Jul 28 2009 Jesse Keating <jkeating at redhat.com> - 0.96-6
- Fix the patch in -4


0002-Temporary-workaround-for-accidentially-re-downloadin.patch:
 bridge.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: 0002-Temporary-workaround-for-accidentially-re-downloadin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sigul/EL-5/0002-Temporary-workaround-for-accidentially-re-downloadin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0002-Temporary-workaround-for-accidentially-re-downloadin.patch	29 Jul 2009 03:19:52 -0000	1.1
+++ 0002-Temporary-workaround-for-accidentially-re-downloadin.patch	29 Jul 2009 03:40:05 -0000	1.2
@@ -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 <jkeating at redhat.com>
 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
 


Index: sigul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sigul/EL-5/sigul.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sigul.spec	29 Jul 2009 03:20:36 -0000	1.2
+++ sigul.spec	29 Jul 2009 03:40:05 -0000	1.3
@@ -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 <jkeating at redhat.com> - 0.96-6
+- Fix the patch in -4
+
 * Tue Jul 28 2009 Jesse Keating <jkeating at redhat.com> - 0.96-5
 - Add a dist tag