Update of /cvsroot/fink/fink/perlmod/Fink/Finally
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2477/perlmod/Fink/Finally
Modified Files:
Buildlock.pm
Log Message:
Store Architecture and Debarch strings in $config object instead of
hard-coded and as a Config global variable. Now we can lie about our
arch! But prohibit compiling and other alterations of local system if
we are not using the native arch.
Index: Buildlock.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Finally/Buildlock.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Buildlock.pm 24 Mar 2006 22:10:52 -0000 1.3
+++ Buildlock.pm 4 Apr 2006 22:45:44 -0000 1.4
@@ -29,7 +29,7 @@
use POSIX qw(strftime);
use Fink::Command qw(mkdir_p rm_rf rm_f);
-use Fink::Config qw($basepath $debarch $config $buildpath);
+use Fink::Config qw($basepath $config $buildpath);
use Fink::CLI qw(&print_breaking &rejoin_text);
use Fink::PkgVersion;
@@ -114,6 +114,7 @@
# generate dpkg "control" file
+ my $debarch = $config->param('Debarch');
my $control = <<EOF;
Package: $lockpkg
Source: fink
@@ -212,7 +213,7 @@
# install lockpkg (== set dpkg lock on our deps)
print "Installing build-lock package...\n";
- my $debfile =
$buildpath.'/'.$lockpkg.'_'.$timestamp.'_'.$debarch.'.deb';
+ my $debfile =
$buildpath.'/'.$lockpkg.'_'.$timestamp.'_'.$config->param('Debarch').'.deb';
my $lock_failed = &execute(dpkg_lockwait() . " -i $debfile",
ignore_INT=>1);
Fink::PkgVersion->dpkg_changed;
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
