[yum-cvs] yum cli.py,1.230,1.231

Seth Vidal skvidal at linux.duke.edu
Fri Sep 1 19:00:09 UTC 2006


Update of /home/groups/yum/cvs/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv28597

Modified Files:
	cli.py 
Log Message:

added our rpmdb index into package objects from the rpmdb.

po.idx

gets rid of last returnIndexesByTuple()



Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- cli.py	25 Aug 2006 17:30:16 -0000	1.230
+++ cli.py	1 Sep 2006 19:00:07 -0000	1.231
@@ -41,17 +41,25 @@
 import callback
 import urlgrabber
 import urlgrabber.grabber
+import signal
+
+def sigquit(signum, frame):
+    print >> sys.stderr, "Quit signal sent - exiting immediately"
+    sys.exit(1)
 
 class CliError(yum.Errors.YumBaseError):
    def __init__(self, args=''):
         yum.Errors.YumBaseError.__init__(self)
         self.args = args
 
+
 class YumBaseCli(yum.YumBase, output.YumOutput):
     """This is the base class for yum cli.
        Inherits from yum.YumBase and output.YumOutput """
        
     def __init__(self):
+        # handle sigquit early on
+        signal.signal(signal.SIGQUIT, sigquit)
         yum.YumBase.__init__(self)
         self.in_shell = False
         logging.basicConfig()
@@ -649,6 +657,9 @@
         self.verbose_logger.log(logginglevels.INFO_2, 'Transaction Test Succeeded')
         del self.ts
         
+        # unset the sigquit handler
+        signal.signal(signal.SIGQUIT, signal.SIG_DFL)
+        
         self.initActionTs() # make a new, blank ts to populate
         self.populateTs(keepold=0) # populate the ts
         self.ts.check() #required for ordering
@@ -668,6 +679,10 @@
 
         # close things
         self.verbose_logger.log(logginglevels.INFO_1, self.postTransactionOutput())
+        
+        # put back the sigquit handler
+        signal.signal(signal.SIGQUIT, sigquit)
+        
         return 0
         
     def gpgsigcheck(self, pkgs):




More information about the Yum-cvs-commits mailing list