From owner-svn-src-head@FreeBSD.ORG Fri Feb 10 00:53:39 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B26DA1065773; Fri, 10 Feb 2012 00:53:39 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A0E618FC14; Fri, 10 Feb 2012 00:53:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1A0rdf0046270; Fri, 10 Feb 2012 00:53:39 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1A0rdbp046268; Fri, 10 Feb 2012 00:53:39 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201202100053.q1A0rdbp046268@svn.freebsd.org> From: Eitan Adler Date: Fri, 10 Feb 2012 00:53:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231328 - head/usr.sbin/pkg_install/create X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2012 00:53:39 -0000 Author: eadler Date: Fri Feb 10 00:53:39 2012 New Revision: 231328 URL: http://svn.freebsd.org/changeset/base/231328 Log: Fix r231300: Use correct test so we only bail out on error instead of on non-error. Also, fix a style bug. Submitted by: ache Approved by: cperciva MFC after: 1 month Modified: head/usr.sbin/pkg_install/create/perform.c Modified: head/usr.sbin/pkg_install/create/perform.c ============================================================================== --- head/usr.sbin/pkg_install/create/perform.c Fri Feb 10 00:51:32 2012 (r231327) +++ head/usr.sbin/pkg_install/create/perform.c Fri Feb 10 00:53:39 2012 (r231328) @@ -216,7 +216,7 @@ pkg_perform(char **pkgs) /* Prefix should add an @cwd to the packing list */ if (Prefix) { char resolved_prefix[PATH_MAX]; - if (realpath(Prefix, resolved_prefix) != 0) + if (realpath(Prefix, resolved_prefix) == NULL) err(EXIT_FAILURE, "couldn't resolve path for prefix: %s", Prefix); add_plist_top(&plist, PLIST_CWD, resolved_prefix); }