From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QgXhU-0008OT-4d for garchives@archives.gentoo.org; Tue, 12 Jul 2011 07:48:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D2D521C04E; Tue, 12 Jul 2011 07:48:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BCE6221C04E for ; Tue, 12 Jul 2011 07:48:03 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E9002AC1E2 for ; Tue, 12 Jul 2011 07:48:03 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2257) id 01A422004B; Tue, 12 Jul 2011 07:48:02 +0000 (UTC) From: "Fabio Erculiani (lxnay)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, lxnay@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: lxnay X-VCS-Committer-Name: Fabio Erculiani Content-Type: text/plain; charset=utf8 Message-Id: <20110712074802.01A422004B@flycatcher.gentoo.org> Date: Tue, 12 Jul 2011 07:48:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d1144b1cfc2c7be7e3347a564f701ebe lxnay 11/07/12 07:48:01 Modified: webapp.eclass Log: Close bug #374697 Revision Changes Path 1.67 eclass/webapp.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.ecla= ss?rev=3D1.67&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.ecla= ss?rev=3D1.67&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.ecla= ss?r1=3D1.66&r2=3D1.67 Index: webapp.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- webapp.eclass 19 May 2011 12:05:13 -0000 1.66 +++ webapp.eclass 12 Jul 2011 07:48:01 -0000 1.67 @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.66 2011/05/1= 9 12:05:13 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.67 2011/07/1= 2 07:48:01 lxnay Exp $ =20 # @ECLASS: webapp.eclass # @MAINTAINER: @@ -121,14 +121,21 @@ if [[ "${my_pvr}" !=3D "${PVR}" ]]; then elog "This is an upgrade" IS_UPGRADE=3D1 + # for binpkgs, reset status, var declared in global scope + IS_REPLACE=3D0 else elog "This is a re-installation" IS_REPLACE=3D1 + # for binpkgs, reset status, var declared in global scope + IS_UPGRADE=3D0 fi else elog "${my_output} is installed there" fi else + # for binpkgs, reset status, var declared in global scope + IS_REPLACE=3D0 + IS_UPGRADE=3D0 elog "This is an installation" fi } @@ -541,7 +548,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} + ${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} ${PN} $= {PVR} fi else ewarn "Cannot find file ${x}/.webapp"