[freeside-commits] freeside/FS/FS/cust_pkg Import.pm, 1.2.2.1, 1.2.2.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/cust_pkg
In directory wavetail.420.am:/tmp/cvs-serv32727

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	Import.pm 
Log Message:
questionable auto-domaining of username at domain usernames on package import, RT#9117

Index: Import.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pkg/Import.pm,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -w -d -r1.2.2.1 -r1.2.2.2
--- Import.pm	21 Jan 2011 09:26:33 -0000	1.2.2.1
+++ Import.pm	21 Jan 2011 09:40:41 -0000	1.2.2.2
@@ -138,14 +138,14 @@
                                                  'domain'  => $domain, };
           unless ( $svc_domain->svcnum ) {
             my $error = $svc_domain->insert;
-            return $error if $error;
+            return "error auto-inserting domain: $error" if $error;
           }
           $svc->username($username);
           $svc->domsvc($svc_domain->svcnum);
         }
 
         my $error = $svc->insert;
-        return $error if $error;
+        return "error inserting service: $error" if $error;
       }
 
     }