Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv15529/perlmod/Fink
Modified Files:
Bootstrap.pm ChangeLog Engine.pm
Log Message:
10.4.9 will mess things up for us... yay sudo :P
Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -d -r1.395 -r1.396
--- Engine.pm 11 Jan 2007 03:17:47 -0000 1.395
+++ Engine.pm 22 Jan 2007 02:35:09 -0000 1.396
@@ -323,7 +323,9 @@
my $method = $config->param_default("RootMethod", "sudo");
if ($method eq "sudo") {
- $cmd = "/usr/bin/sudo $cmd";
+ my $env = '';
+ $env = "/usr/bin/env PERL5LIB='$ENV{'PERL5LIB'}'" if (exists
$ENV{'PERL5LIB'} and defined $ENV{'PERL5LIB'});
+ $cmd = "/usr/bin/sudo $env $cmd";
} elsif ($method eq "su") {
$cmd = "/usr/bin/su root -c '$cmd'";
} else {
Index: Bootstrap.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Bootstrap.pm,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- Bootstrap.pm 11 Jan 2007 03:17:47 -0000 1.151
+++ Bootstrap.pm 22 Jan 2007 02:35:09 -0000 1.152
@@ -634,7 +634,9 @@
my $bpath = shift;
if ($> != 0) {
- exit &execute("sudo ./inject.pl $bpath");
+ my $env = '';
+ $env = "/usr/bin/env PERL5LIB='$ENV{'PERL5LIB'}'" if (exists
$ENV{'PERL5LIB'} and defined $ENV{'PERL5LIB'});
+ exit &execute("/usr/bin/sudo $env ./inject.pl $bpath");
}
umask oct("022");
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1425
retrieving revision 1.1426
diff -u -d -r1.1425 -r1.1426
--- ChangeLog 16 Jan 2007 15:52:06 -0000 1.1425
+++ ChangeLog 22 Jan 2007 02:35:09 -0000 1.1426
@@ -1,3 +1,8 @@
+2007-01-21 Benjamin Reed <[EMAIL PROTECTED]>
+
+ * Bootstrap.pm, Engine.pm: use env to set PERL5LIB since 10.4.9
+ sudo strips it
+
2007-01-16 Benjamin Reed <[EMAIL PROTECTED]>
* PkgVersion.pm: default to "make -j1" in install scripts
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
