rpms/yum/devel yum-ctrl-c.patch,NONE,1.1 yum.spec,1.164,1.165

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/extras/rpms/yum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23644

Modified Files:
	yum.spec 
Added Files:
	yum-ctrl-c.patch 
Log Message:
add ctrl-c patch



yum-ctrl-c.patch:

--- NEW FILE yum-ctrl-c.patch ---
diff --git a/output.py b/output.py
index 835613d..4519477 100644
--- a/output.py
+++ b/output.py
@@ -25,9 +25,15 @@ from i18n import _
 from urlgrabber.progress import TextMeter
 from urlgrabber.grabber import URLGrabError
 from yum.misc import sortPkgObj, prco_tuple_to_string
+from rpmUtils.miscutils import checkSignals
 
 from yum import logginglevels
 
+class YumTextMeter(TextMeter):
+    def update(self, amount_read, now=None):
+        checkSignals()
+        TextMeter.update(self, amount_read, now)
+
 class YumOutput:
 
     def __init__(self):
@@ -329,7 +335,7 @@ Remove   %5.5s Package(s)
             self.repos.setProgressBar(None)
             self.repos.callback = None
         else:
-            self.repos.setProgressBar(TextMeter(fo=sys.stdout))
+            self.repos.setProgressBar(YumTextMeter(fo=sys.stdout))
             self.repos.callback = CacheProgressCallback()
 
         # setup our failure report for failover
diff --git a/rpmUtils/miscutils.py b/rpmUtils/miscutils.py
index f36122f..25ea956 100644
--- a/rpmUtils/miscutils.py
+++ b/rpmUtils/miscutils.py
@@ -21,6 +21,7 @@ import gzip
 import os
 import sys
 import locale
+import signal
 
 import rpmUtils.transaction
 
@@ -357,3 +358,13 @@ def hdrFromPackage(ts, package):
     
     os.close(fdno)
     return hdr
+
+def checkSignals():
+    if hasattr(rpm, "checkSignals"):
+        if rpm.signalsCaught([signal.SIGINT, 
+                              signal.SIGTERM,
+                              signal.SIGPIPE,
+                              signal.SIGQUIT,
+                              signal.SIGHUP]):
+            exit(1)
+    


Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/yum.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- yum.spec	24 Jul 2007 15:32:50 -0000	1.164
+++ yum.spec	25 Jul 2007 14:37:08 -0000	1.165
@@ -3,13 +3,14 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
 Source1: yum.conf.fedora
 Source2: yum-updatesd.conf.fedora
 Patch0: installonlyn-enable.patch
+Patch1: yum-ctrl-c.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -45,7 +46,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .installonly
-
+%patch0 -p0 -b .ctrl-c
 
 %build
 make
@@ -90,6 +91,10 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed Jul 25 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.2-3
+- include panu's rpm-signal-catch patch from yum head.
+
+
 * Tue Jul 24 2007 Jeremy Katz <katzj at redhat.com> - 3.2.2-2
 - remove yum-updatesd subpackage; moving to the separate version