From cd3cb35c7ce76f9e70d06200fcb7f44b3f03ee72 Mon Sep 17 00:00:00 2001 From: "kestes%staff.mail.com" Date: Thu, 31 Aug 2000 21:59:53 +0000 Subject: [PATCH] forgot that if I change peristance then the admin code changes also. I use persistance for the passwd table. git-svn-id: svn://10.0.0.236/trunk@77785 18797224-902f-48f8-a5cc-f745e15eee43 --- .../webtools/tinderbox2/src/bin/admintree.cgi | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/mozilla/webtools/tinderbox2/src/bin/admintree.cgi b/mozilla/webtools/tinderbox2/src/bin/admintree.cgi index 0427e87f356..a90d04a6300 100755 --- a/mozilla/webtools/tinderbox2/src/bin/admintree.cgi +++ b/mozilla/webtools/tinderbox2/src/bin/admintree.cgi @@ -2,8 +2,8 @@ # -*- Mode: perl; indent-tabs-mode: nil -*- # -# $Revision: 1.3 $ -# $Date: 2000-08-30 02:20:13 $ +# $Revision: 1.4 $ +# $Date: 2000-08-31 21:59:53 $ # $Author: kestes%staff.mail.com $ # $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/bin/admintree.cgi,v $ # $Name: not supported by cvs2svn $ @@ -127,8 +127,11 @@ sub get_passwd_table { my ($file) = FileStructure::get_filename($TREE, 'passwd'); - (-r $file) && - require $file; + (-r $file) || + return ; + + my ($r) = Persistence::load_structure($file); + $PASSWD_TABLE{$TREE} = $r; return ; } @@ -314,14 +317,7 @@ sub save_passwd_table { my ($file) = FileStructure::get_filename($TREE, 'passwd'); if ( keys %{ $PASSWD_TABLE{$TREE} } ) { - Persistence::save_structure( - [ - $PASSWD_TABLE{$TREE}, - ], - [ - "\$PASSWD_TABLE{'$TREE'}", - ], - $file); + Persistence::save_structure($PASSWD_TABLE{$TREE},$file); } return ;