rpms/lcgdm/F-13 lcgdm-bashisms.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 lcgdm.spec, 1.1, 1.2 sources, 1.2, 1.3 lcgdm-man.patch, 1.1, NONE lcgdm-typo.patch, 1.1, NONE
Mattias Ellert
ellert at fedoraproject.org
Sun Jun 6 22:29:30 UTC 2010
Author: ellert
Update of /cvs/pkgs/rpms/lcgdm/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21817/F-13
Modified Files:
.cvsignore import.log lcgdm.spec sources
Added Files:
lcgdm-bashisms.patch
Removed Files:
lcgdm-man.patch lcgdm-typo.patch
Log Message:
* Sun Jun 06 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.4.7-1
- Update to version 1.7.4.7
- This version works with gsoap versions > 2.7.15
- Dropped patches lcgdm-typo.patch and lcgdm-man.patch (fixed upstream)
lcgdm-bashisms.patch:
dicomcopy/dicomcopyd.scripts.mysql | 16 ++++++++--------
dicomcopy/dicomcopyd.scripts.oracle | 16 ++++++++--------
dicomcopy/dicomcopyd.scripts.postgresql | 16 ++++++++--------
dli/lfc-dli.scripts | 16 ++++++++--------
dpm/dpm.scripts.mysql | 16 ++++++++--------
dpm/dpm.scripts.oracle | 16 ++++++++--------
dpm/dpm.scripts.postgresql | 16 ++++++++--------
dpmcopy/dpmcopyd.scripts.mysql | 16 ++++++++--------
dpmcopy/dpmcopyd.scripts.oracle | 16 ++++++++--------
dpmcopy/dpmcopyd.scripts.postgresql | 16 ++++++++--------
ns/dpnsdaemon.scripts.mysql | 16 ++++++++--------
ns/dpnsdaemon.scripts.oracle | 16 ++++++++--------
ns/dpnsdaemon.scripts.postgresql | 16 ++++++++--------
ns/lfcdaemon.scripts.mysql | 16 ++++++++--------
ns/lfcdaemon.scripts.oracle | 16 ++++++++--------
ns/lfcdaemon.scripts.postgresql | 16 ++++++++--------
rfio/rfiod.scripts | 8 ++++----
srmv1/srmv1.scripts.mysql | 16 ++++++++--------
srmv1/srmv1.scripts.oracle | 16 ++++++++--------
srmv1/srmv1.scripts.postgresql | 16 ++++++++--------
srmv2.2/srmv2.2.scripts.mysql | 16 ++++++++--------
srmv2.2/srmv2.2.scripts.oracle | 16 ++++++++--------
srmv2.2/srmv2.2.scripts.postgresql | 16 ++++++++--------
srmv2/srmv2.scripts.mysql | 16 ++++++++--------
srmv2/srmv2.scripts.oracle | 16 ++++++++--------
srmv2/srmv2.scripts.postgresql | 16 ++++++++--------
26 files changed, 204 insertions(+), 204 deletions(-)
--- NEW FILE lcgdm-bashisms.patch ---
diff -ur lcgdm-1.7.4.7.orig/dicomcopy/dicomcopyd.scripts.mysql lcgdm-1.7.4.7/dicomcopy/dicomcopyd.scripts.mysql
--- lcgdm-1.7.4.7.orig/dicomcopy/dicomcopyd.scripts.mysql 2010-06-06 13:49:38.000000000 +0200
+++ lcgdm-1.7.4.7/dicomcopy/dicomcopyd.scripts.mysql 2010-06-06 16:31:53.219681160 +0200
@@ -81,8 +81,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -172,14 +172,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DICOMCOPYSHUTDOWN -f -h `hostname`
else
- $DICOMCOPYSHUTDOWN -f -h `hostname` >& /dev/null
+ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -187,7 +187,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -203,14 +203,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DICOMCOPYSHUTDOWN -f -h `hostname`
else
- $DICOMCOPYSHUTDOWN -f -h `hostname` >& /dev/null
+ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -218,7 +218,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/dicomcopy/dicomcopyd.scripts.oracle lcgdm-1.7.4.7/dicomcopy/dicomcopyd.scripts.oracle
--- lcgdm-1.7.4.7.orig/dicomcopy/dicomcopyd.scripts.oracle 2010-06-06 13:49:38.000000000 +0200
+++ lcgdm-1.7.4.7/dicomcopy/dicomcopyd.scripts.oracle 2010-06-06 16:31:53.216681272 +0200
@@ -83,8 +83,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -197,14 +197,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DICOMCOPYSHUTDOWN -f -h `hostname`
else
- $DICOMCOPYSHUTDOWN -f -h `hostname` >& /dev/null
+ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -212,7 +212,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -228,14 +228,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DICOMCOPYSHUTDOWN -f -h `hostname`
else
- $DICOMCOPYSHUTDOWN -f -h `hostname` >& /dev/null
+ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -243,7 +243,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/dicomcopy/dicomcopyd.scripts.postgresql lcgdm-1.7.4.7/dicomcopy/dicomcopyd.scripts.postgresql
--- lcgdm-1.7.4.7.orig/dicomcopy/dicomcopyd.scripts.postgresql 2010-06-06 13:49:38.000000000 +0200
+++ lcgdm-1.7.4.7/dicomcopy/dicomcopyd.scripts.postgresql 2010-06-06 16:31:53.222681327 +0200
@@ -81,8 +81,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -172,14 +172,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DICOMCOPYSHUTDOWN -f -h `hostname`
else
- $DICOMCOPYSHUTDOWN -f -h `hostname` >& /dev/null
+ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -187,7 +187,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -203,14 +203,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DICOMCOPYSHUTDOWN -f -h `hostname`
else
- $DICOMCOPYSHUTDOWN -f -h `hostname` >& /dev/null
+ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -218,7 +218,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/dli/lfc-dli.scripts lcgdm-1.7.4.7/dli/lfc-dli.scripts
--- lcgdm-1.7.4.7.orig/dli/lfc-dli.scripts 2010-06-06 13:49:40.000000000 +0200
+++ lcgdm-1.7.4.7/dli/lfc-dli.scripts 2010-06-06 16:31:53.155679063 +0200
@@ -79,8 +79,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -160,14 +160,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DLISHUTDOWN -f -h `hostname`
else
- $DLISHUTDOWN -f -h `hostname` >& /dev/null
+ $DLISHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -175,7 +175,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -191,14 +191,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DLISHUTDOWN -f -h `hostname`
else
- $DLISHUTDOWN -f -h `hostname` >& /dev/null
+ $DLISHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -206,7 +206,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/dpm/dpm.scripts.mysql lcgdm-1.7.4.7/dpm/dpm.scripts.mysql
--- lcgdm-1.7.4.7.orig/dpm/dpm.scripts.mysql 2010-06-06 13:49:30.000000000 +0200
+++ lcgdm-1.7.4.7/dpm/dpm.scripts.mysql 2010-06-06 16:31:53.166682330 +0200
@@ -81,8 +81,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -173,14 +173,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPMSHUTDOWN -f -h `hostname`
else
- $DPMSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -188,7 +188,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -204,14 +204,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPMSHUTDOWN -f -h `hostname`
else
- $DPMSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -219,7 +219,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/dpm/dpm.scripts.oracle lcgdm-1.7.4.7/dpm/dpm.scripts.oracle
--- lcgdm-1.7.4.7.orig/dpm/dpm.scripts.oracle 2010-06-06 13:49:30.000000000 +0200
+++ lcgdm-1.7.4.7/dpm/dpm.scripts.oracle 2010-06-06 16:31:53.162677567 +0200
@@ -83,8 +83,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -198,14 +198,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPMSHUTDOWN -f -h `hostname`
else
- $DPMSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -213,7 +213,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -229,14 +229,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPMSHUTDOWN -f -h `hostname`
else
- $DPMSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -244,7 +244,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/dpm/dpm.scripts.postgresql lcgdm-1.7.4.7/dpm/dpm.scripts.postgresql
--- lcgdm-1.7.4.7.orig/dpm/dpm.scripts.postgresql 2010-06-06 13:49:30.000000000 +0200
+++ lcgdm-1.7.4.7/dpm/dpm.scripts.postgresql 2010-06-06 16:31:53.170682832 +0200
@@ -81,8 +81,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -173,14 +173,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPMSHUTDOWN -f -h `hostname`
else
- $DPMSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -188,7 +188,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -204,14 +204,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPMSHUTDOWN -f -h `hostname`
else
- $DPMSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -219,7 +219,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/dpmcopy/dpmcopyd.scripts.mysql lcgdm-1.7.4.7/dpmcopy/dpmcopyd.scripts.mysql
--- lcgdm-1.7.4.7.orig/dpmcopy/dpmcopyd.scripts.mysql 2010-06-06 13:49:34.000000000 +0200
+++ lcgdm-1.7.4.7/dpmcopy/dpmcopyd.scripts.mysql 2010-06-06 16:31:53.173677481 +0200
@@ -81,8 +81,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -172,14 +172,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPMCOPYSHUTDOWN -f -h `hostname`
else
- $DPMCOPYSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -187,7 +187,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -203,14 +203,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPMCOPYSHUTDOWN -f -h `hostname`
else
- $DPMCOPYSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -218,7 +218,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/dpmcopy/dpmcopyd.scripts.oracle lcgdm-1.7.4.7/dpmcopy/dpmcopyd.scripts.oracle
--- lcgdm-1.7.4.7.orig/dpmcopy/dpmcopyd.scripts.oracle 2010-06-06 13:49:34.000000000 +0200
+++ lcgdm-1.7.4.7/dpmcopy/dpmcopyd.scripts.oracle 2010-06-06 16:31:53.177680777 +0200
@@ -83,8 +83,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -198,14 +198,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPMCOPYSHUTDOWN -f -h `hostname`
else
- $DPMCOPYSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -213,7 +213,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -229,14 +229,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPMCOPYSHUTDOWN -f -h `hostname`
else
- $DPMCOPYSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -244,7 +244,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/dpmcopy/dpmcopyd.scripts.postgresql lcgdm-1.7.4.7/dpmcopy/dpmcopyd.scripts.postgresql
--- lcgdm-1.7.4.7.orig/dpmcopy/dpmcopyd.scripts.postgresql 2010-06-06 13:49:34.000000000 +0200
+++ lcgdm-1.7.4.7/dpmcopy/dpmcopyd.scripts.postgresql 2010-06-06 16:31:53.180681363 +0200
@@ -81,8 +81,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -172,14 +172,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPMCOPYSHUTDOWN -f -h `hostname`
else
- $DPMCOPYSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -187,7 +187,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -203,14 +203,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPMCOPYSHUTDOWN -f -h `hostname`
else
- $DPMCOPYSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -218,7 +218,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/ns/dpnsdaemon.scripts.mysql lcgdm-1.7.4.7/ns/dpnsdaemon.scripts.mysql
--- lcgdm-1.7.4.7.orig/ns/dpnsdaemon.scripts.mysql 2010-06-06 13:49:38.000000000 +0200
+++ lcgdm-1.7.4.7/ns/dpnsdaemon.scripts.mysql 2010-06-06 16:31:53.209681441 +0200
@@ -76,8 +76,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -165,14 +165,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPNSSHUTDOWN -f -h `hostname`
else
- $DPNSSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -180,7 +180,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -196,14 +196,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPNSSHUTDOWN -f -h `hostname`
else
- $DPNSSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -211,7 +211,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/ns/dpnsdaemon.scripts.oracle lcgdm-1.7.4.7/ns/dpnsdaemon.scripts.oracle
--- lcgdm-1.7.4.7.orig/ns/dpnsdaemon.scripts.oracle 2010-06-06 13:49:38.000000000 +0200
+++ lcgdm-1.7.4.7/ns/dpnsdaemon.scripts.oracle 2010-06-06 16:31:53.206681414 +0200
@@ -78,8 +78,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -191,14 +191,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPNSSHUTDOWN -f -h `hostname`
else
- $DPNSSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -206,7 +206,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -222,14 +222,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPNSSHUTDOWN -f -h `hostname`
else
- $DPNSSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -237,7 +237,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/ns/dpnsdaemon.scripts.postgresql lcgdm-1.7.4.7/ns/dpnsdaemon.scripts.postgresql
--- lcgdm-1.7.4.7.orig/ns/dpnsdaemon.scripts.postgresql 2010-06-06 13:49:38.000000000 +0200
+++ lcgdm-1.7.4.7/ns/dpnsdaemon.scripts.postgresql 2010-06-06 16:31:53.200681429 +0200
@@ -76,8 +76,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -165,14 +165,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPNSSHUTDOWN -f -h `hostname`
else
- $DPNSSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -180,7 +180,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -196,14 +196,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$DPNSSHUTDOWN -f -h `hostname`
else
- $DPNSSHUTDOWN -f -h `hostname` >& /dev/null
+ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -211,7 +211,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/ns/lfcdaemon.scripts.mysql lcgdm-1.7.4.7/ns/lfcdaemon.scripts.mysql
--- lcgdm-1.7.4.7.orig/ns/lfcdaemon.scripts.mysql 2010-06-06 13:49:38.000000000 +0200
+++ lcgdm-1.7.4.7/ns/lfcdaemon.scripts.mysql 2010-06-06 16:31:53.203681247 +0200
@@ -76,8 +76,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -175,14 +175,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$LFCSHUTDOWN -f -h `hostname`
else
- $LFCSHUTDOWN -f -h `hostname` >& /dev/null
+ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -190,7 +190,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -206,14 +206,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$LFCSHUTDOWN -f -h `hostname`
else
- $LFCSHUTDOWN -f -h `hostname` >& /dev/null
+ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -221,7 +221,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/ns/lfcdaemon.scripts.oracle lcgdm-1.7.4.7/ns/lfcdaemon.scripts.oracle
--- lcgdm-1.7.4.7.orig/ns/lfcdaemon.scripts.oracle 2010-06-06 13:49:38.000000000 +0200
+++ lcgdm-1.7.4.7/ns/lfcdaemon.scripts.oracle 2010-06-06 16:31:53.197681402 +0200
@@ -78,8 +78,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -201,14 +201,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$LFCSHUTDOWN -f -h `hostname`
else
- $LFCSHUTDOWN -f -h `hostname` >& /dev/null
+ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -216,7 +216,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -232,14 +232,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$LFCSHUTDOWN -f -h `hostname`
else
- $LFCSHUTDOWN -f -h `hostname` >& /dev/null
+ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -247,7 +247,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/ns/lfcdaemon.scripts.postgresql lcgdm-1.7.4.7/ns/lfcdaemon.scripts.postgresql
--- lcgdm-1.7.4.7.orig/ns/lfcdaemon.scripts.postgresql 2010-06-06 13:49:38.000000000 +0200
+++ lcgdm-1.7.4.7/ns/lfcdaemon.scripts.postgresql 2010-06-06 16:31:53.194681374 +0200
@@ -76,8 +76,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -175,14 +175,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$LFCSHUTDOWN -f -h `hostname`
else
- $LFCSHUTDOWN -f -h `hostname` >& /dev/null
+ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -190,7 +190,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -206,14 +206,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$LFCSHUTDOWN -f -h `hostname`
else
- $LFCSHUTDOWN -f -h `hostname` >& /dev/null
+ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -221,7 +221,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/rfio/rfiod.scripts lcgdm-1.7.4.7/rfio/rfiod.scripts
--- lcgdm-1.7.4.7.orig/rfio/rfiod.scripts 2010-06-06 13:49:33.000000000 +0200
+++ lcgdm-1.7.4.7/rfio/rfiod.scripts 2010-06-06 16:31:53.213677473 +0200
@@ -77,8 +77,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -163,7 +163,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -9 `cat $PIDFILE`
else
- kill -9 `cat $PIDFILE` >& /dev/null
+ kill -9 `cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
@@ -182,7 +182,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -9 $pid
else
- kill -9 $pid >& /dev/null
+ kill -9 $pid > /dev/null 2>&1
fi
RETVAL=$?
else
diff -ur lcgdm-1.7.4.7.orig/srmv1/srmv1.scripts.mysql lcgdm-1.7.4.7/srmv1/srmv1.scripts.mysql
--- lcgdm-1.7.4.7.orig/srmv1/srmv1.scripts.mysql 2010-06-06 13:49:41.000000000 +0200
+++ lcgdm-1.7.4.7/srmv1/srmv1.scripts.mysql 2010-06-06 16:31:53.187680356 +0200
@@ -81,8 +81,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -172,14 +172,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV1SHUTDOWN -f -h `hostname`
else
- $SRMV1SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -187,7 +187,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -203,14 +203,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV1SHUTDOWN -f -h `hostname`
else
- $SRMV1SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -218,7 +218,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/srmv1/srmv1.scripts.oracle lcgdm-1.7.4.7/srmv1/srmv1.scripts.oracle
--- lcgdm-1.7.4.7.orig/srmv1/srmv1.scripts.oracle 2010-06-06 13:49:41.000000000 +0200
+++ lcgdm-1.7.4.7/srmv1/srmv1.scripts.oracle 2010-06-06 16:31:53.190678637 +0200
@@ -83,8 +83,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -198,14 +198,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV1SHUTDOWN -f -h `hostname`
else
- $SRMV1SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -213,7 +213,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -229,14 +229,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV1SHUTDOWN -f -h `hostname`
else
- $SRMV1SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -244,7 +244,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/srmv1/srmv1.scripts.postgresql lcgdm-1.7.4.7/srmv1/srmv1.scripts.postgresql
--- lcgdm-1.7.4.7.orig/srmv1/srmv1.scripts.postgresql 2010-06-06 13:49:41.000000000 +0200
+++ lcgdm-1.7.4.7/srmv1/srmv1.scripts.postgresql 2010-06-06 16:31:53.184677605 +0200
@@ -81,8 +81,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -172,14 +172,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV1SHUTDOWN -f -h `hostname`
else
- $SRMV1SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -187,7 +187,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -203,14 +203,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV1SHUTDOWN -f -h `hostname`
else
- $SRMV1SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -218,7 +218,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/srmv2/srmv2.scripts.mysql lcgdm-1.7.4.7/srmv2/srmv2.scripts.mysql
--- lcgdm-1.7.4.7.orig/srmv2/srmv2.scripts.mysql 2010-06-06 13:49:41.000000000 +0200
+++ lcgdm-1.7.4.7/srmv2/srmv2.scripts.mysql 2010-06-06 16:31:53.148677347 +0200
@@ -81,8 +81,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -172,14 +172,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV2SHUTDOWN -f -h `hostname`
else
- $SRMV2SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -187,7 +187,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -203,14 +203,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV2SHUTDOWN -f -h `hostname`
else
- $SRMV2SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -218,7 +218,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/srmv2/srmv2.scripts.oracle lcgdm-1.7.4.7/srmv2/srmv2.scripts.oracle
--- lcgdm-1.7.4.7.orig/srmv2/srmv2.scripts.oracle 2010-06-06 13:49:41.000000000 +0200
+++ lcgdm-1.7.4.7/srmv2/srmv2.scripts.oracle 2010-06-06 16:31:53.151680587 +0200
@@ -83,8 +83,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -198,14 +198,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV2SHUTDOWN -f -h `hostname`
else
- $SRMV2SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -213,7 +213,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -229,14 +229,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV2SHUTDOWN -f -h `hostname`
else
- $SRMV2SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -244,7 +244,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/srmv2/srmv2.scripts.postgresql lcgdm-1.7.4.7/srmv2/srmv2.scripts.postgresql
--- lcgdm-1.7.4.7.orig/srmv2/srmv2.scripts.postgresql 2010-06-06 13:49:41.000000000 +0200
+++ lcgdm-1.7.4.7/srmv2/srmv2.scripts.postgresql 2010-06-06 16:31:53.145677459 +0200
@@ -81,8 +81,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -172,14 +172,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV2SHUTDOWN -f -h `hostname`
else
- $SRMV2SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -187,7 +187,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -203,14 +203,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV2SHUTDOWN -f -h `hostname`
else
- $SRMV2SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -218,7 +218,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/srmv2.2/srmv2.2.scripts.mysql lcgdm-1.7.4.7/srmv2.2/srmv2.2.scripts.mysql
--- lcgdm-1.7.4.7.orig/srmv2.2/srmv2.2.scripts.mysql 2010-06-06 13:49:34.000000000 +0200
+++ lcgdm-1.7.4.7/srmv2.2/srmv2.2.scripts.mysql 2010-06-06 16:31:53.135677461 +0200
@@ -81,8 +81,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -172,14 +172,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV2SHUTDOWN -f -h `hostname`
else
- $SRMV2SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -187,7 +187,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -203,14 +203,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV2SHUTDOWN -f -h `hostname`
else
- $SRMV2SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -218,7 +218,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/srmv2.2/srmv2.2.scripts.oracle lcgdm-1.7.4.7/srmv2.2/srmv2.2.scripts.oracle
--- lcgdm-1.7.4.7.orig/srmv2.2/srmv2.2.scripts.oracle 2010-06-06 13:49:34.000000000 +0200
+++ lcgdm-1.7.4.7/srmv2.2/srmv2.2.scripts.oracle 2010-06-06 16:31:53.138677349 +0200
@@ -83,8 +83,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -198,14 +198,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV2SHUTDOWN -f -h `hostname`
else
- $SRMV2SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -213,7 +213,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -229,14 +229,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV2SHUTDOWN -f -h `hostname`
else
- $SRMV2SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -244,7 +244,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
diff -ur lcgdm-1.7.4.7.orig/srmv2.2/srmv2.2.scripts.postgresql lcgdm-1.7.4.7/srmv2.2/srmv2.2.scripts.postgresql
--- lcgdm-1.7.4.7.orig/srmv2.2/srmv2.2.scripts.postgresql 2010-06-06 13:49:34.000000000 +0200
+++ lcgdm-1.7.4.7/srmv2.2/srmv2.2.scripts.postgresql 2010-06-06 16:31:53.141677655 +0200
@@ -81,8 +81,8 @@
#
## Blindly attempt to create useful directories
#
-# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR >& /dev/null
-# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR >& /dev/null
+# [ ! -d $PIDDIR ] && mkdir -p $PIDDIR > /dev/null 2>&1
+# [ ! -d $SUBSYSDIR ] && mkdir -p $SUBSYSDIR > /dev/null 2>&1
if [ $sysname = "HP-UX" ]; then
export UNIX95=1
@@ -172,14 +172,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV2SHUTDOWN -f -h `hostname`
else
- $SRMV2SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -187,7 +187,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -`cat $PIDFILE`
else
- kill -2 -`cat $PIDFILE` >& /dev/null
+ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -203,14 +203,14 @@
if [ $SILENTSTOP -eq 0 ]; then
$SRMV2SHUTDOWN -f -h `hostname`
else
- $SRMV2SHUTDOWN -f -h `hostname` >& /dev/null
+ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
fi
RETVAL=$?
if [ $RETVAL -ne 0 ]; then
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
@@ -218,7 +218,7 @@
if [ $SILENTSTOP -eq 0 ]; then
kill -2 -$pid
else
- kill -2 -$pid >& /dev/null
+ kill -2 -$pid > /dev/null 2>&1
fi
RETVAL=$?
fi
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lcgdm/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 8 Apr 2010 09:22:43 -0000 1.2
+++ .cvsignore 6 Jun 2010 22:29:29 -0000 1.3
@@ -1 +1 @@
-lcgdm-1.7.4.4.tar.gz
+lcgdm-1.7.4.7.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/lcgdm/F-13/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 8 Apr 2010 09:22:43 -0000 1.1
+++ import.log 6 Jun 2010 22:29:29 -0000 1.2
@@ -1 +1,2 @@
lcgdm-1_7_4_4-2_fc12:F-13:lcgdm-1.7.4.4-2.fc12.src.rpm:1270718546
+lcgdm-1_7_4_7-1_fc12:F-13:lcgdm-1.7.4.7-1.fc12.src.rpm:1275863352
Index: lcgdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lcgdm/F-13/lcgdm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lcgdm.spec 8 Apr 2010 09:22:44 -0000 1.1
+++ lcgdm.spec 6 Jun 2010 22:29:29 -0000 1.2
@@ -2,8 +2,8 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: lcgdm
-Version: 1.7.4.4
-Release: 2%{?dist}
+Version: 1.7.4.7
+Release: 1%{?dist}
Summary: LHC Computing Grid Data Management
Group: System Environment/Libraries
@@ -21,33 +21,30 @@ Source6: README.Fedora.dpns-postgres
# Fix non-standard installation path
# https://savannah.cern.ch/bugs/?57526
Patch0: %{name}-paths.patch
-# Fix makefile typo
-# https://savannah.cern.ch/bugs/?65297
-Patch1: %{name}-typo.patch
# Link using $(CC)
# https://savannah.cern.ch/bugs/?57527
-Patch2: %{name}-ld.patch
+Patch1: %{name}-ld.patch
# Fix soname issues
# https://savannah.cern.ch/bugs/?57528
-Patch3: %{name}-withsoname.patch
+Patch2: %{name}-withsoname.patch
# Link binaries using shared libraries
# https://savannah.cern.ch/bugs/?57529
-Patch4: %{name}-shliblink.patch
+Patch3: %{name}-shliblink.patch
# Link to gsoap library, fix parallel build
# https://savannah.cern.ch/bugs/?57530
-Patch5: %{name}-gsoap.patch
-# Fix man pages
-# https://savannah.cern.ch/bugs/?65298
-Patch6: %{name}-man.patch
+Patch4: %{name}-gsoap.patch
# Fix build on GNU/Hurd and GNU/kFreeBSD
# https://savannah.cern.ch/bugs/?61071
-Patch7: %{name}-porting.patch
+Patch5: %{name}-porting.patch
+# Remove bashisms in init scripts:
+# https://savannah.cern.ch/bugs/?68430
+Patch6: %{name}-bashisms.patch
# Adapt upstream's hardcoded include and library paths for Fedora
-Patch8: %{name}-usr.patch
+Patch7: %{name}-usr.patch
# Allow moving plugins out of default library search path
-Patch9: %{name}-dlopen.patch
+Patch8: %{name}-dlopen.patch
# Use Fedora's imake instead of bundled version
-Patch10: %{name}-imake.patch
+Patch9: %{name}-imake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
@@ -511,7 +508,6 @@ pushd $d/%{name}-%{version}
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
chmod 644 security/globus_gsi_gss_constants.h \
security/globus_i_gsi_credential.h \
@@ -537,7 +533,7 @@ install -m 644 -p %{SOURCE5} dpm-postgre
install -m 644 -p %{SOURCE6} dpm-postgres/%{name}-%{version}/ns/README.Fedora
%build
-gsoapversion=`soapcpp2 -v 2>&1 | grep Compiler | sed 's/.* //'`
+gsoapversion=`soapcpp2 -v 2>&1 | grep C++ | sed 's/.* //'`
pushd lfc-mysql/%{name}-%{version}
@@ -552,7 +548,7 @@ pushd lfc-mysql/%{name}-%{version}
make -f Makefile.ini Makefiles
-make %{?_smp_mflags} prefix=%{_prefix} POSINC=-I/usr/include/postgresql
+make %{?_smp_mflags} prefix=%{_prefix}
popd
@@ -2266,6 +2262,14 @@ fi
%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2.2
%changelog
+* Sun Jun 06 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.4.7-1
+- Update to version 1.7.4.7
+- This version works with gsoap versions > 2.7.15
+- Dropped patches lcgdm-typo.patch and lcgdm-man.patch (fixed upstream)
+
+* Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.7.4.4-3
+- Mass rebuild with perl-5.12.0
+
* Thu Apr 08 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.7.4.4-2
- Fix priorities for alternatives
- Add -p flag to install commands
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lcgdm/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 8 Apr 2010 09:22:44 -0000 1.2
+++ sources 6 Jun 2010 22:29:29 -0000 1.3
@@ -1 +1 @@
-4438553d8dc692d0208512357a5df668 lcgdm-1.7.4.4.tar.gz
+643ae14795fe1f9e8468b185953aefbd lcgdm-1.7.4.7.tar.gz
--- lcgdm-man.patch DELETED ---
--- lcgdm-typo.patch DELETED ---
More information about the scm-commits
mailing list