Hi Chris,
Thanks for your patch.
Now, I commit your patch and build cmu package. Then, I will put these
update packages into testing repository in a few hours.
Thanks,
Hisao
On 2006/05/05, at 0:27, Chris Hemsing wrote:
> Hi Hisao,
>
> Another bug(let) I found:
>
> the cmuImport does not delete index.html on the ~user web page as it
> should and in fact tries to.
> It does work on the imported site web page.
> So, unless your imported ~user webpage also has an "index.html" which
> overrides the existing one,
> apache will show you the standard index.html instead of the imported
> webpages. I traced it and below is the (small) fix.
>
> Cheers
> Chris
>
> ************* 5100Rscanin.pl.patch ************
> *** /usr/cmu/scripts/5100Rscanin.pl.orig 2006-04-28
> 16:22:31.000000000 +0200
> --- /usr/cmu/scripts/5100Rscanin.pl 2006-04-28
> 16:32:22.000000000 +0200
> ***************
> *** 2,7 ****
> --- 2,8 ----
> # $Id: 5100Rscanin.pl,v 1.3 2006/03/29 09:22:05 shibuya Exp $
> # Cobalt Networks, Inc http://www.cobalt.com
> # Copyright 2001 Sun Microsystems, Inc. All rights reserved.
> + # C. Hemsing: minor repair on tilde expansion
> use strict;
>
> use lib "/usr/cmu/perl";
> ***************
> *** 203,209 ****
> $oid = $cce->oid();
> $cce->unLoadNamespace($uTree, $oid);
>
> ! unlink('~'.$user.'/web/index.html');
>
> # slap the crypt and md5 if it is around
> if($cfg->noPasswd eq 't') {
> --- 204,211 ----
> $oid = $cce->oid();
> $cce->unLoadNamespace($uTree, $oid);
>
> ! # note: for tilde expansion to work you need glob()
> ! unlink(glob('~'.$user.'/web/index.html'));
>
> # slap the crypt and md5 if it is around
> if($cfg->noPasswd eq 't') {
> ********** End of 5100Rscanin.pl.patch *********
>