Hello all,

I just noticed a problem with the previous attempt to fix the tsdb init script install location... namely, we don't remove the previously created directory containing the init script.

From spacewalk-list:
-------
3) The "tsdb" package did not update.  I ran into an error unpacking
it... after a few attempts.

Error unpacking rpm package tsdb-1.27.21-1.el5.noarch
error: unpacking of archive failed on
file /etc/rc.d/init.d/tsdb_local_queue: cpio: rename
-------

Attached is a patch to look for the existence of a directory where the init script should be and remove it. Built and tested locally.

Josh
From 9199ac9a0952a4cdfa9206a51189482ebb209015 Mon Sep 17 00:00:00 2001
From: Joshua Roys <[email protected]>
Date: Thu, 10 Dec 2009 13:45:33 -0500
Subject: [PATCH] Fix the fix to install the tsdb init script

Commit 0c93b6054f5aeb581e3eb2c1a6d93660648ef8f5 installed the tsdb
init script in the proper location... however, it did not (re)move
the previously created directory containing the init script.
---
 monitoring/tsdb/tsdb.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/monitoring/tsdb/tsdb.spec b/monitoring/tsdb/tsdb.spec
index 95b4020..64a7661 100644
--- a/monitoring/tsdb/tsdb.spec
+++ b/monitoring/tsdb/tsdb.spec
@@ -60,6 +60,11 @@ install -m 755 LocalQueue/rebalance_cron 
$RPM_BUILD_ROOT%{_bindir}
 # Local queue init script (temporary, will be superseded by sysv stuff)
 install -D -m 755 LocalQueue/init_script $RPM_BUILD_ROOT%{init_script}
 
+%pre
+if [ -d %{init_script} -a %{init_script} != "/" ]; then
+  rm -rf %{init_script}
+fi
+
 %post
 if [ $1 -eq 2 ]; then
   ls /opt/nocpulse/TSDBLocalQueue/TSDBLocalQueue.log 2>/dev/null | xargs -I 
file mv file %lqdir
-- 
1.6.5.2

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature

_______________________________________________
Spacewalk-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/spacewalk-devel

Reply via email to