Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1475
Modified Files:
Tag: branch_0_24
Bootstrap.pm ChangeLog SelfUpdate.pm
Log Message:
During selfupdate only update "important" packages (like gettext-dev) if
they are already installed (backport from HEAD)
Index: Bootstrap.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Bootstrap.pm,v
retrieving revision 1.90.2.20
retrieving revision 1.90.2.21
diff -u -d -r1.90.2.20 -r1.90.2.21
--- Bootstrap.pm 10 Sep 2005 17:26:09 -0000 1.90.2.20
+++ Bootstrap.pm 31 Oct 2005 17:07:56 -0000 1.90.2.21
@@ -336,6 +336,12 @@
my $perl_is_supported = 1;
+# note: we must install any package which is a splitoff of an essential
+# package here. If we fail to do so, we could find ourselves in the
+# situation where foo-shlibs has been updated, but foo-dev was left at
+# the old version (and is installed as the old version). This could lead
+# to problems the next time foo was used to compile something.
+
my @addlist = ("apt", "apt-shlibs", "bzip2-dev", "gettext-dev",
"gettext-bin", "libiconv-dev", "libncurses5");
if ("$]" == "5.006") {
push @addlist, "storable-pm560", "file-spec-pm560",
"test-harness-pm560", "test-simple-pm560";
Index: SelfUpdate.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/SelfUpdate.pm,v
retrieving revision 1.81.2.2
retrieving revision 1.81.2.3
diff -u -d -r1.81.2.2 -r1.81.2.3
--- SelfUpdate.pm 13 Jul 2005 00:04:42 -0000 1.81.2.2
+++ SelfUpdate.pm 31 Oct 2005 17:07:56 -0000 1.81.2.3
@@ -526,7 +526,13 @@
print_breaking("WARNING! This version of Perl ($]) is not currently
supported by Fink. Updating anyway, but you may encounter problems.\n") unless
$perl_is_supported;
- push @elist, @{$package_list};
+ foreach my $important (@$package_list) {
+ my $po = Fink::Package->package_by_name($important);
+ if ($po && $po->is_any_installed()) {
+ # only worry about "important" ones that are already
installed
+ push @elist, $important;
+ }
+ }
# update them
Fink::Engine::cmd_install(@elist);
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.873.2.63
retrieving revision 1.873.2.64
diff -u -d -r1.873.2.63 -r1.873.2.64
--- ChangeLog 27 Sep 2005 18:23:11 -0000 1.873.2.63
+++ ChangeLog 31 Oct 2005 17:07:56 -0000 1.873.2.64
@@ -1,3 +1,8 @@
+2005-10-31 Daniel Macks <[EMAIL PROTECTED]>
+
+ * SelfUpdate.pm: During finish(), only update "important" (but not
+ Essential) packages if they are already installed (backport from HEAD)
+
2005-09-27 Alexander Hansen <[EMAIL PROTECTED]>
* NetAccess.pm: Backport axel verbose flag (-v vs --verbose) from HEAD.
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
