From ec70b9131ae5df9c58b75e8d6db75e5fddb6362a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 21 Jan 2011 09:40:40 +0000
Subject: [PATCH] questionable auto-domaining of username@domain usernames on
 package import, RT#9117

---
 FS/FS/cust_pkg/Import.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FS/FS/cust_pkg/Import.pm b/FS/FS/cust_pkg/Import.pm
index e113d1712..9c93677a7 100644
--- a/FS/FS/cust_pkg/Import.pm
+++ b/FS/FS/cust_pkg/Import.pm
@@ -138,14 +138,14 @@ my %import_options = (
                                                  '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;
       }
 
     }
-- 
2.11.0