Author: rvs
Date: Tue Sep 13 22:45:40 2011
New Revision: 1170377
URL: http://svn.apache.org/viewvc?rev=1170377&view=rev
Log:
BIGTOP-84. Package removal fails in case alternatives are deleted or damaged
Added:
incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm
- copied, changed from r1170376,
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.prerm
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.prerm
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.prerm
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm
incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.prerm
incubator/bigtop/trunk/bigtop-packages/src/deb/pig/hadoop-pig.prerm
incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.prerm
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.prerm?rev=1170377&r1=1170376&r2=1170377&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.prerm (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/flume/flume.prerm Tue Sep 13
22:45:40 2011
@@ -35,7 +35,7 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
- update-alternatives --remove flume-conf /etc/flume/conf.empty
+ update-alternatives --remove flume-conf /etc/flume/conf.empty || :
;;
failed-upgrade)
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.prerm
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.prerm?rev=1170377&r1=1170376&r2=1170377&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.prerm
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.prerm
Tue Sep 13 22:45:40 2011
@@ -35,8 +35,7 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
- update-alternatives --remove hadoop-conf /etc/hadoop/conf.pseudo >
/dev/null || exit 1
- rm -f /etc/hadoop/conf
+ update-alternatives --remove hadoop-conf /etc/hadoop/conf.pseudo >
/dev/null || :
;;
failed-upgrade)
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.prerm
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.prerm?rev=1170377&r1=1170376&r2=1170377&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.prerm
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.prerm Tue Sep
13 22:45:40 2011
@@ -35,7 +35,7 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
- update-alternatives --remove hadoop-conf /etc/hadoop/conf.empty
+ update-alternatives --remove hadoop-conf /etc/hadoop/conf.empty || :
;;
failed-upgrade)
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm?rev=1170377&r1=1170376&r2=1170377&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm Tue
Sep 13 22:45:40 2011
@@ -23,7 +23,7 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
- update-alternatives --remove hive-conf /etc/hive/conf.dist
+ update-alternatives --remove hive-conf /etc/hive/conf.dist || :
;;
failed-upgrade)
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.prerm
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.prerm?rev=1170377&r1=1170376&r2=1170377&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.prerm
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/mahout.prerm Tue Sep
13 22:45:40 2011
@@ -3,7 +3,7 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
- update-alternatives --remove mahout-conf /etc/mahout/conf.dist
+ update-alternatives --remove mahout-conf /etc/mahout/conf.dist || :
;;
failed-upgrade)
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/pig/hadoop-pig.prerm
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/pig/hadoop-pig.prerm?rev=1170377&r1=1170376&r2=1170377&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/pig/hadoop-pig.prerm
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/pig/hadoop-pig.prerm Tue Sep
13 22:45:40 2011
@@ -35,7 +35,7 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
- update-alternatives --remove pig-conf /etc/pig/conf.dist
+ update-alternatives --remove pig-conf /etc/pig/conf.dist || :
;;
failed-upgrade)
Copied:
incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm
(from r1170376,
incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm)
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm?p2=incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm&p1=incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm&r1=1170376&r2=1170377&rev=1170377&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hadoop-hive.prerm
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/hadoop-zookeeper.prerm
Tue Sep 13 22:45:40 2011
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# prerm script for hive
+# prerm script for zookeeper
#
# see: dh_installdeb(1)
@@ -23,7 +23,7 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
- update-alternatives --remove hive-conf /etc/hive/conf.dist
+ update-alternatives --remove hadoop-zookeeper-conf
/etc/zookeeper/conf.dist || :
;;
failed-upgrade)
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec?rev=1170377&r1=1170376&r2=1170377&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec Tue
Sep 13 22:45:40 2011
@@ -157,7 +157,7 @@ getent passwd flume >/dev/null || userad
%preun
if [ "$1" = 0 ]; then
- %{alternatives_cmd} --remove %{name}-conf %{etc_flume}.empty
+ %{alternatives_cmd} --remove %{name}-conf %{etc_flume}.empty || :
fi
%files
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1170377&r1=1170376&r2=1170377&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Tue
Sep 13 22:45:40 2011
@@ -392,8 +392,8 @@ if [ "$1" = 0 ]; then
do
service hadoop-$service stop 1>/dev/null 2>/dev/null || :
done
- %{alternatives_cmd} --remove %{name}-conf %{etc_hadoop}/conf.empty
- %{alternatives_cmd} --remove %{hadoop_name}-default %{bin_hadoop}/%{name}
+ %{alternatives_cmd} --remove %{name}-conf %{etc_hadoop}/conf.empty || :
+ %{alternatives_cmd} --remove %{hadoop_name}-default %{bin_hadoop}/%{name} ||
:
fi
%files
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1170377&r1=1170376&r2=1170377&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec Tue Sep
13 22:45:40 2011
@@ -173,7 +173,7 @@ fi
%preun
if [ "$1" = 0 ]; then
- %{alternatives_cmd} --remove hive-conf %{etc_hive}/conf.dist
+ %{alternatives_cmd} --remove hive-conf %{etc_hive}/conf.dist || :
fi
%__rmdir /var/log/hive 2>/dev/null || :
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec?rev=1170377&r1=1170376&r2=1170377&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec Tue
Sep 13 22:45:40 2011
@@ -83,7 +83,7 @@ ln -s /usr/lib/hadoop/hadoop-core.jar $R
%preun
if [ "$1" = 0 ]; then
- %{alternatives_cmd} --remove %{mahout_name}-conf %{config_mahout}.dist
+ %{alternatives_cmd} --remove %{mahout_name}-conf %{config_mahout}.dist
|| :
fi
#######################
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec?rev=1170377&r1=1170376&r2=1170377&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec Tue Sep
13 22:45:40 2011
@@ -139,7 +139,7 @@ fi
%preun
# If we are uninstalling pig
if [ "$1" = 0 ]; then
- %{alternatives_cmd} --remove pig-conf %{etc_pig}/conf.dist
+ %{alternatives_cmd} --remove pig-conf %{etc_pig}/conf.dist || :
fi
#######################
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec?rev=1170377&r1=1170376&r2=1170377&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
Tue Sep 13 22:45:40 2011
@@ -146,7 +146,7 @@ getent passwd zookeeper > /dev/null || u
%preun
if [ "$1" = 0 ]; then
- %{alternatives_cmd} --remove %{name}-conf %{etc_zookeeper}/conf.dist
+ %{alternatives_cmd} --remove %{name}-conf %{etc_zookeeper}/conf.dist
|| :
fi
%post server
