diff options
| author |   Devan Franchini <twitch153@gentoo.org> | 2015-05-15 19:27:54 -0400 |
|---|---|---|
| committer | Devan Franchini <twitch153@gentoo.org> | 2015-06-19 15:50:44 -0400 |
| commit | a0e4225b724e80e47aa2aa1877d4bbe0fd3641ed (patch) | |
| tree | 496f9a3cb0a32c1d4c04d1dff6fe74417d886a12 | |
| parent | external.py: Modifies assertion to reflect the expected non-existant webapp r... (diff) | |
| download | webapp-config-a0e4225b724e80e47aa2aa1877d4bbe0fd3641ed.tar.gz webapp-config-a0e4225b724e80e47aa2aa1877d4bbe0fd3641ed.tar.bz2 webapp-config-a0e4225b724e80e47aa2aa1877d4bbe0fd3641ed.zip | |
webapp.eclass: Changes order of command line flags
The change from optparse to argparse requires the flags for upgrading,
installing, or removing a webapp to specify both package name and
package version after the flag.
| -rw-r--r-- | eclass/webapp.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass index ff79700..3d4ca28 100644 --- a/eclass/webapp.eclass +++ b/eclass/webapp.eclass @@ -501,12 +501,12 @@ webapp_pkg_postinst() { elog "${PN}-${PVR} is not installed - using install mode" fi - my_cmd="${WEBAPP_CONFIG} ${my_mode} -h localhost -u root -d ${INSTALL_DIR} ${PN} ${PVR}" + my_cmd="${WEBAPP_CONFIG} -h localhost -u root -d ${INSTALL_DIR} ${my_mode} ${PN} ${PVR}" elog "Running ${my_cmd}" ${my_cmd} echo - local cleaner="${WEBAPP_CLEANER} -p -C /${PN}" + local cleaner="${WEBAPP_CLEANER} -p -C ${CATEGORY}/${PN}" einfo "Running ${cleaner}" ${cleaner} else @@ -517,7 +517,7 @@ webapp_pkg_postinst() { elog elog "To install ${PN}-${PVR} into a virtual host, run the following command:" elog - elog " webapp-config -I -h <host> -d ${PN} ${PN} ${PVR}" + elog " webapp-config -h <host> -d ${PN} -I ${PN} ${PVR}" elog elog "For more details, see the webapp-config(8) man page" fi @@ -529,7 +529,7 @@ webapp_pkg_postinst() { elog elog "To install ${PN}-${PVR} into a virtual host, run the following command:" elog - elog " webapp-config -I -h <host> -d ${PN} ${PN} ${PVR}" + elog " webapp-config -h <host> -d ${PN} -I ${PN} ${PVR}" elog elog "For more details, see the webapp-config(8) man page" fi @@ -553,7 +553,7 @@ webapp_pkg_prerm() { if [[ -f "${x}"/.webapp ]]; then . "${x}"/.webapp if [[ -n "${WEB_HOSTNAME}" && -n "${WEB_INSTALLDIR}" ]]; then - ${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} ${PN} ${PVR} + ${WEBAPP_CONFIG} -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} -C ${PN} ${PVR} fi else ewarn "Cannot find file ${x}/.webapp" |