From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sun, 4 Feb 2007 01:05:28 +0000 (+0000)
Subject: - avoid regenerating yum metadata if no packages are newer than the
X-Git-Tag: planetlab-4_0-rc1~11
X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=e432974c3c8ef648782172d855d20cb6d51ed5ae

- avoid regenerating yum metadata if no packages are newer than the
  metadata files
---

diff --git a/plc.d/packages b/plc.d/packages
index 3392ed1..dab7fca 100755
--- a/plc.d/packages
+++ b/plc.d/packages
@@ -7,7 +7,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: packages,v 1.5 2007/01/30 15:09:22 thierry Exp $
+# $Id: packages,v 1.6 2007/01/30 15:56:53 thierry Exp $
 #
 
 # Source function library and configuration
@@ -34,25 +34,35 @@ case "$1" in
 	fi
 
 	for repository in $repositories ; do
-            # Sign all RPMS. setsid detaches rpm from the terminal,
-            # allowing the (hopefully blank) GPG password to be
-            # entered from stdin instead of /dev/tty.
 	    packages=
 	    stamps=
-	    # create a stamp once the package gets signed
+	    yum_arch=0
+	    createrepo=0
+
+	    # Create a stamp once the package gets signed
 	    mkdir $repository/signed-stamps
 
 	    for package in $repository/*.rpm ; do
 	        stamp=$repository/signed-stamps/$(basename $package).signed
-		# is package newer than stamp ?
+		# If package is newer than signature stamp
 		if [ $package -nt $stamp ] ; then
 		    packages="$packages $package"
 		    stamps="$stamps $stamp"
-		else
-		    echo "Package $package already signed - skipped"
+		fi
+		# Or yum-arch headers
+		if [ $package -nt $repository/headers/header.info ] ; then
+		    yum_arch=1
+		fi
+		# Or createrepo database
+		if [ $package -nt $repository/repodata/repomd.xml ] ; then
+		    createrepo=1
 		fi
 	    done
+
 	    if [ -n "$packages" ] ; then
+		# Sign RPMS. setsid detaches rpm from the terminal,
+                # allowing the (hopefully blank) GPG password to be
+                # entered from stdin instead of /dev/tty.
 		echo | setsid rpm \
 		    --define "_signature gpg" \
 		    --define "_gpg_path /etc/planetlab" \
@@ -64,10 +74,22 @@ case "$1" in
 	    # Update yum metadata. yum-arch createrepo sometimes leaves behind
 	    # .oldheaders and .olddata directories accidentally.
 	    rm -rf $repository/{.oldheaders,.olddata}
-	    yum-arch $repository
-	    check
-	    createrepo -g yumgroups.xml $repository
-	    check
+
+	    # Old command is yum-arch
+	    if [ $yum_arch -eq 1 ] ; then
+		yum-arch $repository
+		check
+	    fi
+
+	    # New command is createrepo
+	    if [ $createrepo -eq 1 ] ; then
+		if [ -f $repository/yumgroups.xml ] ; then
+		    createrepo -g yumgroups.xml $repository
+		else
+		    createrepo $repository
+		fi
+		check
+	    fi
 	done
 
 	result "$MESSAGE"