projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d7fa80b
)
better error handling for re-imports
author
ivan
<ivan>
Thu, 12 Jun 2003 13:57:08 +0000
(13:57 +0000)
committer
ivan
<ivan>
Thu, 12 Jun 2003 13:57:08 +0000
(13:57 +0000)
bin/passwd.import
patch
|
blob
|
history
diff --git
a/bin/passwd.import
b/bin/passwd.import
index
fbf2737
..
304499e
100755
(executable)
--- a/
bin/passwd.import
+++ b/
bin/passwd.import
@@
-1,5
+1,5
@@
#!/usr/bin/perl -Tw
#!/usr/bin/perl -Tw
-# $Id: passwd.import,v 1.
5 2002-06-21 09:57:05
ivan Exp $
+# $Id: passwd.import,v 1.
6 2003-06-12 13:57:08
ivan Exp $
use strict;
use vars qw(%part_svc);
use strict;
use vars qw(%part_svc);
@@
-104,7
+104,13
@@
while (<PASSWD>) {
});
my($error);
$error=$svc_acct->insert;
});
my($error);
$error=$svc_acct->insert;
- die $error if $error;
+ if ( $error ) {
+ if ( $error =~ /duplicate/i ) {
+ warn "$username: $error";
+ } else {
+ die "$username: $error";
+ }
+ }
}
}