[freeside-commits] branch master updated. f41b13b6abee080901f3b8d10ed7918102970ae6

[Ivan]

The branch, master has been updated
       via  f41b13b6abee080901f3b8d10ed7918102970ae6 (commit)
      from  65d0561c4d456c2d600acb03a675549d098f5776 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f41b13b6abee080901f3b8d10ed7918102970ae6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Sep 11 01:41:23 2013 -0700

    avoid noise on upgrades

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 056b80b..037c4b3 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');
 
 }
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Upgrade.pm |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)