From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 11 Sep 2013 08:41:26 +0000 (-0700)
Subject: avoid noise on upgrades
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=6ebb1fc69db49b6aaafd28b15db3a5aab07b1ac0;p=freeside.git

avoid noise on upgrades
---

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index cda3198eb..21dda0959 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -86,10 +86,10 @@ sub upgrade_config {
 
   # if there's a USPS tools login, assume that's the standardization method
   # you want to use
-  if ( length($conf->config('usps_webtools-userid')) > 0 and
-       !$conf->exists('address_standardize_method') ) {
-    $conf->set('address_standardize_method', 'usps');
-  }
+  $conf->set('address_standardize_method', 'usps')
+    if $conf->exists('usps_webtools-userid')
+    && length($conf->config('usps_webtools-userid')) > 0
+    && ! $conf->exists('address_standardize_method');
 
 }