- Fix a bug when values of -M was ignored.

Submitted by:	John E Hein <jhein@timing.com>
This commit is contained in:
Sergey Matveychuk 2006-07-12 16:21:32 +00:00
parent de68ffab47
commit 8e4d616b11
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=167588
4 changed files with 26 additions and 0 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 2.1.3.2
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \

View File

@ -0,0 +1,12 @@
--- bin/portupgrade.orig Wed Jul 12 20:09:27 2006
+++ bin/portupgrade Wed Jul 12 20:09:59 2006
@@ -900,8 +900,7 @@
def get_make_env(origin, is_new = false)
$make_env_table ||= compile_config_table(config_value(:MAKE_ENV))
- envset = lookup_config_table($make_env_table, origin, nil) or
- return Array.new
+ envset = (lookup_config_table($make_env_table, origin, nil) or Array.new)
make_env = $make_env.dup
if make_env.empty?

View File

@ -7,6 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 2.1.3.2
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \

View File

@ -0,0 +1,12 @@
--- bin/portupgrade.orig Wed Jul 12 20:09:27 2006
+++ bin/portupgrade Wed Jul 12 20:09:59 2006
@@ -900,8 +900,7 @@
def get_make_env(origin, is_new = false)
$make_env_table ||= compile_config_table(config_value(:MAKE_ENV))
- envset = lookup_config_table($make_env_table, origin, nil) or
- return Array.new
+ envset = (lookup_config_table($make_env_table, origin, nil) or Array.new)
make_env = $make_env.dup
if make_env.empty?