From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DFD2E138CD0 for ; Thu, 2 Jul 2015 14:02:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12FD2E0833; Thu, 2 Jul 2015 14:02:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8383E0833 for ; Thu, 2 Jul 2015 14:02:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 989BE3406A0 for ; Thu, 2 Jul 2015 14:02:36 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 2346) id 8E51274C; Thu, 2 Jul 2015 14:02:34 +0000 (UTC) From: "Devan Franchini (twitch153)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, twitch153@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: webapp.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: webapp.eclass X-VCS-Directories: eclass X-VCS-Committer: twitch153 X-VCS-Committer-Name: Devan Franchini Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20150702140234.8E51274C@oystercatcher.gentoo.org> Date: Thu, 2 Jul 2015 14:02:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 719d5175-05d1-4c42-a31e-09e57a66df85 X-Archives-Hash: c898b54c88426ef9e261f7097efbc214 twitch153 15/07/02 14:02:34 Modified: webapp.eclass Log: webapp.eclass: Updates eclass to reflect migration from optparse to argparse These changes move the command line args for -I/-C/-U to the ${PN} and the ${PV} vars. This ensures both forwards and backwards compatibility. Revision Changes Path 1.74 eclass/webapp.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?rev=1.74&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?rev=1.74&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?r1=1.73&r2=1.74 Index: webapp.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- webapp.eclass 12 May 2015 15:15:31 -0000 1.73 +++ webapp.eclass 2 Jul 2015 14:02:34 -0000 1.74 @@ -1,6 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.73 2015/05/12 15:15:31 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.74 2015/07/02 14:02:34 twitch153 Exp $ # @ECLASS: webapp.eclass # @MAINTAINER: @@ -244,6 +244,7 @@ local my_file="$(webapp_strip_appdir "${1}")" my_file="$(webapp_strip_cwd "${my_file}")" + elog "(server owned) ${my_file}" echo "${my_file}" >> "${D}/${WA_SOLIST}" } @@ -412,9 +413,7 @@ ewarn "This ebuild may be overwriting important files." ewarn echo - if has "${EAPI:-0}" 0 1 2; then - ebeep 10 - fi + ebeep 10 elif [[ "$(echo ${my_output} | awk '{ print $1 }')" != "${PN}" ]]; then echo eerror "You already have ${my_output} installed in ${my_dir}" @@ -502,12 +501,12 @@ 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 @@ -518,7 +517,7 @@ elog elog "To install ${PN}-${PVR} into a virtual host, run the following command:" elog - elog " webapp-config -I -h -d ${PN} ${PN} ${PVR}" + elog " webapp-config -h -d ${PN} -I ${PN} ${PVR}" elog elog "For more details, see the webapp-config(8) man page" fi @@ -530,7 +529,7 @@ elog elog "To install ${PN}-${PVR} into a virtual host, run the following command:" elog - elog " webapp-config -I -h -d ${PN} ${PN} ${PVR}" + elog " webapp-config -h -d ${PN} -I ${PN} ${PVR}" elog elog "For more details, see the webapp-config(8) man page" fi @@ -554,7 +553,7 @@ 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"