projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c2562ed
)
belt and braces locate users.v4 in DXUser.pm
author
Dirk Koopman
<djk@tobit.co.uk>
Wed, 20 May 2020 14:59:58 +0000
(15:59 +0100)
committer
Dirk Koopman
<djk@tobit.co.uk>
Wed, 20 May 2020 14:59:58 +0000
(15:59 +0100)
perl/DXUser.pm
patch
|
blob
|
history
diff --git
a/perl/DXUser.pm
b/perl/DXUser.pm
index ee24c5d4a3f4b0ea76c55991a71e63a107a1bb81..5e8f2dfab50abfb600c7fe128881e892a09b44cb 100644
(file)
--- a/
perl/DXUser.pm
+++ b/
perl/DXUser.pm
@@
-897,10
+897,13
@@
sub readinjson
move($nfn, $fn);
};
move($nfn, $fn);
};
- # if we don't have a users.v4 at this point, look for a backup users.v4.o
+ # if we don't have a users.v4 at this point, look for a backup users.v4.
json, users.v4.n then users.v4.
o
unless (-e $fn) {
unless (-e $fn) {
- move($ofn, $fn);
+ move($nfn, $fn) unless -e $fn; # the users.v4 isn't there (maybe convert-users-v3-to-v4.pl
+ move("$fn.json", $fn); # from a run of convert-users-v3-to-v4.pl
+ move($ofn, $fn) unless -e $fn; # desperate now...
}
}
+
if ($ifh) {
$ifh->seek(0, 0);
} else {
if ($ifh) {
$ifh->seek(0, 0);
} else {