[freeside-commits] branch FREESIDE_3_BRANCH updated. 6ebb1fc69db49b6aaafd28b15db3a5aab07b1ac0

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  6ebb1fc69db49b6aaafd28b15db3a5aab07b1ac0 (commit)
      from  47d47f7b4a77761d5617a64212d6b1460fa27adf (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 6ebb1fc69db49b6aaafd28b15db3a5aab07b1ac0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Sep 11 01:41:26 2013 -0700

    avoid noise on upgrades

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index cda3198..21dda09 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(-)