From owner-cvs-all@FreeBSD.ORG  Mon Jun 20 18:08:33 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B832616A41C;
	Mon, 20 Jun 2005 18:08:33 +0000 (GMT)
	(envelope-from glewis@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A5AC343D58;
	Mon, 20 Jun 2005 18:08:33 +0000 (GMT)
	(envelope-from glewis@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5KI8Xl9060997;
	Mon, 20 Jun 2005 18:08:33 GMT
	(envelope-from glewis@repoman.freebsd.org)
Received: (from glewis@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5KI8XYc060996;
	Mon, 20 Jun 2005 18:08:33 GMT (envelope-from glewis)
Message-Id: <200506201808.j5KI8XYc060996@repoman.freebsd.org>
From: Greg Lewis <glewis@FreeBSD.org>
Date: Mon, 20 Jun 2005 18:08:33 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/java/javavmwrapper Makefile
 ports/java/javavmwrapper/src javavmwrapper.sh
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jun 2005 18:08:33 -0000

glewis      2005-06-20 18:08:33 UTC

  FreeBSD ports repository

  Modified files:
    java/javavmwrapper   Makefile 
    java/javavmwrapper/src javavmwrapper.sh 
  Log:
  . Check the user can read/write the configuration file and that it exists
    before attempting to sort it when running checkvms.  This prevents a
    double error message for an unprivileged user.
  . When asked to register a VM that is already registered, don't error.
    Print a warning that the VM is already registered and don't add it to
    the configuration file (but do check its links and sort the config
    file still).  This prevents problems with
  
          'make install -DFORCE_PKG_REGISTER'
  
    erroring out during the post-install stage for the JDK ports.
    Bump PORTREVISION for this change since it affects the various JDK
    ports. [2]
  
  Reported by:    anholt, via hq [2]
  
  Revision  Changes    Path
  1.21      +1 -1      ports/java/javavmwrapper/Makefile
  1.12      +11 -8     ports/java/javavmwrapper/src/javavmwrapper.sh