Browse code
Update the package name of qpid in the fedora platform
The package name of qpid in default yum repository
is qpid-cpp-server, not qpid-cpp-server-daemon.
Fix bug 1177731
Change-Id: I4412029966583f5ef5a5a4cc80e7fdc4771c8eca
zhhuabj authored on 2013/05/08 19:27:20Showing 3 changed files
| ... | ... |
@@ -70,11 +70,7 @@ function cleanup_rpc_backend {
|
| 70 | 70 |
fi |
| 71 | 71 |
elif is_service_enabled qpid; then |
| 72 | 72 |
if is_fedora; then |
| 73 |
- if [[ $DISTRO =~ (rhel6) ]]; then |
|
| 74 |
- uninstall_package qpid-cpp-server |
|
| 75 |
- else |
|
| 76 |
- uninstall_package qpid-cpp-server-daemon |
|
| 77 |
- fi |
|
| 73 |
+ uninstall_package qpid-cpp-server |
|
| 78 | 74 |
elif is_ubuntu; then |
| 79 | 75 |
uninstall_package qpidd |
| 80 | 76 |
else |
| ... | ... |
@@ -104,15 +100,12 @@ function install_rpc_backend() {
|
| 104 | 104 |
rm -f "$tfile" |
| 105 | 105 |
elif is_service_enabled qpid; then |
| 106 | 106 |
if is_fedora; then |
| 107 |
+ install_package qpid-cpp-server |
|
| 107 | 108 |
if [[ $DISTRO =~ (rhel6) ]]; then |
| 108 |
- install_package qpid-cpp-server |
|
| 109 |
- |
|
| 110 | 109 |
# RHEL6 leaves "auth=yes" in /etc/qpidd.conf, it needs to |
| 111 | 110 |
# be no or you get GSS authentication errors as it |
| 112 | 111 |
# attempts to default to this. |
| 113 | 112 |
sudo sed -i.bak 's/^auth=yes$/auth=no/' /etc/qpidd.conf |
| 114 |
- else |
|
| 115 |
- install_package qpid-cpp-server-daemon |
|
| 116 | 113 |
fi |
| 117 | 114 |
elif is_ubuntu; then |
| 118 | 115 |
install_package qpidd |