From owner-svn-src-user@FreeBSD.ORG Mon Dec 7 06:27:47 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 7732C1065676;
Mon, 7 Dec 2009 06:27:47 +0000 (UTC)
(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 663398FC12;
Mon, 7 Dec 2009 06:27:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nB76Rl5R043875;
Mon, 7 Dec 2009 06:27:47 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB76Rla5043873;
Mon, 7 Dec 2009 06:27:47 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200912070627.nB76Rla5043873@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 7 Dec 2009 06:27:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r200206 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Dec 2009 06:27:47 -0000
Author: dougb
Date: Mon Dec 7 06:27:47 2009
New Revision: 200206
URL: http://svn.freebsd.org/changeset/base/200206
Log:
If we get to the end of the search for a package and latest_pv is still
not set, don't attempt to modify it.
Modified:
user/dougb/portmaster/portmaster
Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster Mon Dec 7 06:25:19 2009 (r200205)
+++ user/dougb/portmaster/portmaster Mon Dec 7 06:27:47 2009 (r200206)
@@ -2528,12 +2528,13 @@ fetch_package () {
echo " Check the pkg_add(1) man page for information"
echo " on setting the PACKAGESITE environment variable"
fail 'No package archive found'
+ else
+ latest_pv=${latest_pv#*href=\"}
+ latest_pv=${latest_pv%%\.tbz*}
+ case "$latest_pv" in
+ *%2[cC]*) latest_pv=`echo $latest_pv | sed s#%2[cC]#,#` ;;
+ esac
fi
- latest_pv=${latest_pv#*href=\"}
- latest_pv=${latest_pv%%\.tbz*}
- case "$latest_pv" in
- *%2[cC]*) latest_pv=`echo $latest_pv | sed s#%2[cC]#,#` ;;
- esac
notnewer () {
echo ''