Add hooks to rebuild rpm DB.

diff --git a/NodeUpdate.py b/NodeUpdate.py
index 6696bfb..28e635a 100644 (file)
--- a/NodeUpdate.py
+++ b/NodeUpdate.py
@@ -1,57 +1,9 @@
 #!/usr/bin/python2
 
 #!/usr/bin/python2
 

-# Copyright (c) 2003 Intel Corporation
-# All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-
-#     * Neither the name of the Intel Corporation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# EXPORT LAWS: THIS LICENSE ADDS NO RESTRICTIONS TO THE EXPORT LAWS OF
-# YOUR JURISDICTION. It is licensee's responsibility to comply with any
-# export regulations applicable in licensee's jurisdiction. Under
-# CURRENT (May 2000) U.S. export regulations this software is eligible
-# for export from the U.S. and can be downloaded by or otherwise
-# exported or reexported worldwide EXCEPT to U.S. embargoed destinations
-# which include Cuba, Iraq, Libya, North Korea, Iran, Syria, Sudan,
-# Afghanistan and any other country to which the U.S. has embargoed
-# goods and services.
-
-

 import sys, os
 from random import Random
 import string
 
 import sys, os
 from random import Random
 import string
 

-# not needed now
-#PLANETLAB_BIN = "/usr/local/planetlab/bin/"
-#sys.path.append(PLANETLAB_BIN)
-#import BootServerRequest
-
-

 NODEUPDATE_PID_FILE= "/var/run/NodeUpdate.pid"
 
 # variables for cron file creation
 NODEUPDATE_PID_FILE= "/var/run/NodeUpdate.pid"
 
 # variables for cron file creation


@@ -212,7 +164,13 @@ class NodeUpdate:
             self.ClearRebootFlag()
             os.system( "/sbin/shutdown -r now" )
 
             self.ClearRebootFlag()
             os.system( "/sbin/shutdown -r now" )
 

-            
+    def RebuildRPMdb( self ):
+        Message( "\nRebuilding RPM Database." )
+        try: os.system( "rm /var/lib/rpm/__db.*" )
+        except Exception, err: print "RebuildRPMdb: %s" % err
+        try: os.system( "%s --rebuilddb" % RPM_PATH )
+        except Exception, err: print "RebuildRPMdb: %s" % err
+

     def RemoveRPMS( self ):
 
         Message( "\nLooking for RPMs to be deleted." )
     def RemoveRPMS( self ):
 
         Message( "\nLooking for RPMs to be deleted." )


@@ -295,6 +253,7 @@ if __name__ == "__main__":
     if not nodeupdate:
         Error( "Unable to initialize." )
     else:
     if not nodeupdate:
         Error( "Unable to initialize." )
     else:

+        nodeupdate.RebuildRPMdb()

         nodeupdate.RemoveRPMS()
         nodeupdate.InstallKeys()
         nodeupdate.CheckForUpdates()
         nodeupdate.RemoveRPMS()
         nodeupdate.InstallKeys()
         nodeupdate.CheckForUpdates()