monitoring/tsdb/tsdb.spec
| 5 +++++
schema/spacewalk/common/data/rhnChecksumType.sql
| 2 --
schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/004-2-rhnChecksumType-data.sql
| 3 ---
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 2070c477b594ca5d8fe9f731966efe0d88b8b79b
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Thu Dec 10 13:45:33 2009 -0500
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.
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
commit c54fd63e9661dd74f913353f0db565cb279b2698
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 4 11:56:44 2010 +0100
removed sha224; java.security.MessageDigest can't handle it
diff --git a/schema/spacewalk/common/data/rhnChecksumType.sql
b/schema/spacewalk/common/data/rhnChecksumType.sql
index 8b0a71f..7ce8c5a 100644
--- a/schema/spacewalk/common/data/rhnChecksumType.sql
+++ b/schema/spacewalk/common/data/rhnChecksumType.sql
@@ -22,8 +22,6 @@ insert into rhnChecksumType (id, label, description) values
insert into rhnChecksumType (id, label, description) values
(rhn_checksum_id_seq.nextval, 'sha1', 'sha1sum' );
insert into rhnChecksumType (id, label, description) values
- (rhn_checksum_id_seq.nextval, 'sha224', 'sha224sum' );
-insert into rhnChecksumType (id, label, description) values
(rhn_checksum_id_seq.nextval, 'sha256', 'sha256sum' );
insert into rhnChecksumType (id, label, description) values
(rhn_checksum_id_seq.nextval, 'sha384', 'sha384sum' );
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/004-2-rhnChecksumType-data.sql
b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/004-2-rhnChecksumType-data.sql
index a035be1..74bf149 100644
---
a/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/004-2-rhnChecksumType-data.sql
+++
b/schema/spacewalk/upgrade/spacewalk-schema-0.7-to-spacewalk-schema-0.8/004-2-rhnChecksumType-data.sql
@@ -4,8 +4,5 @@ update rhnChecksumType
update rhnChecksumType
set description = label || 'sum';
-insert into rhnChecksumType (id, label, description) values
- (rhn_checksum_id_seq.nextval, 'sha224', 'sha224sum' );
-
commit;
Show replies by thread