rpms/kernel/devel kernel.spec,1.819,1.820

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22024

Modified Files:
	kernel.spec 
Log Message:
remove stale vanilla directories when prepping


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.819
retrieving revision 1.820
diff -u -r1.819 -r1.820
--- kernel.spec	29 Jul 2008 04:16:47 -0000	1.819
+++ kernel.spec	29 Jul 2008 12:41:48 -0000	1.820
@@ -858,12 +858,25 @@
 if [ ! -d kernel-%{kversion}/vanilla-%{vanillaversion} ]; then
 
   if [ -d kernel-%{kversion}/vanilla-%{kversion} ]; then
+
     cd kernel-%{kversion}
+    # any vanilla-* directories other than the base one are stale
+    oldvanilla=$(ls -d vanilla-* | grep -v "^vanilla-%{kversion}$")
+    # Just in case we ctrl-c'd a prep already
+    rm -rf deleteme.vanilla-*
+    for staledir in $oldvanilla ; do
+      # Move away the stale away, and delete in background.
+      mv $staledir deleteme.$staledir
+      rm -rf deleteme.$staledir &
+    done
+
   else
+
     # Ok, first time we do a make prep.
     rm -f pax_global_header
 %setup -q -n kernel-%{kversion} -c
     mv linux-%{kversion} vanilla-%{kversion}
+
   fi
 
 %if "%{kversion}" != "%{vanillaversion}"
@@ -890,7 +903,7 @@
 %endif
 %endif
 
- cd ..
+  cd ..
 
 else
   # We already have a vanilla dir.