Update of /cvsroot/fink/fink
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11443
Modified Files:
ChangeLog bootstrap postinstall.pl.in
Log Message:
only use main/crypto among default Trees when distribution is 10.5 or earlier
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -d -r1.530 -r1.531
--- ChangeLog 2 Jul 2010 21:47:48 -0000 1.530
+++ ChangeLog 4 Jul 2010 17:10:11 -0000 1.531
@@ -1,3 +1,9 @@
+2010-07-04 Dave Morrison <d...@finkproject.org>
+
+ * postinstall.pl.in: Fink::Bootstrap::add_injected_to_trees now
+ takes $distribution as an argument
+ * bootstrap: now calls Fink::Config::fink_tree_default
+
2010-07-02 Dave Morrison <d...@finkproject.org>
* fink.info.in, Makefile, setup.sh: feed $Distribution to setup.sh
Index: postinstall.pl.in
===================================================================
RCS file: /cvsroot/fink/fink/postinstall.pl.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- postinstall.pl.in 7 Jan 2010 01:50:23 -0000 1.48
+++ postinstall.pl.in 4 Jul 2010 17:10:11 -0000 1.49
@@ -106,7 +106,7 @@
my $updating = 0;
if ( not ($distold eq $distribution)) {
- add_injected_to_trees();
+ add_injected_to_trees($distribution);
$updating = 1;
### FIXME: this variable is a hook to action in Fink::SelfUpdate::finish,
### but that action has not yet been implemented. (The variable should
Index: bootstrap
===================================================================
RCS file: /cvsroot/fink/fink/bootstrap,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- bootstrap 7 Jan 2010 02:13:02 -0000 1.41
+++ bootstrap 4 Jul 2010 17:10:11 -0000 1.42
@@ -423,10 +423,11 @@
}
my $selfupdatetrees = get_selfupdatetrees($distribution);
+my $fink_trees = &Fink::Config::fink_tree_default($distribution);
my @dirlist = qw(etc etc/alternatives etc/apt src fink fink/debs var var/lib
var/lib/fink);
push @dirlist, "fink/$selfupdatetrees", "fink/$selfupdatetrees/stable",
"fink/$selfupdatetrees/local";
-foreach my $dir (qw(stable/main stable/crypto local/main)) {
+foreach my $dir (split(/ /,$fink_trees)) {
push @dirlist, "fink/$selfupdatetrees/$dir",
"fink/$selfupdatetrees/$dir/finkinfo",
"fink/$selfupdatetrees/$dir/binary-darwin-$arch";
}
@@ -441,7 +442,7 @@
# install the initial Release and Packages.gz files
my ($dr,$arv,$comp);
-foreach $dr (qw(stable/main stable/crypto local/main)) {
+foreach $dr (split(/ /,$fink_trees)) {
($arv,$comp) = split(/\//, $dr);
&execute("/usr/bin/sed -e \"s,\...@arv\@,$arv,\" -e \"s,\...@comp\@,$comp,\"
-e \"s,\...@arch\@,$arch,\" < Release >
$installto/fink/$selfupdatetrees/$dr/binary-darwin-$arch/Release;
/usr/bin/touch
$installto/fink/$selfupdatetrees/$dr/binary-darwin-$arch/Packages;
/usr/bin/gzip
$installto/fink/$selfupdatetrees/$dr/binary-darwin-$arch/Packages");
}
@@ -501,7 +502,7 @@
# Fink configuration, initially created by bootstrap
Basepath: $installto
RootMethod: $rootmethod
-Trees: local/main stable/main stable/crypto
+Trees: $fink_trees
Distribution: $distribution
SelfUpdateTrees: $selfupdatetrees
EOF
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
