Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19822
Modified Files:
ChangeLog Engine.pm
Log Message:
remove implicit dep on essential, if there are any problems cirdan will fix them
Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -d -r1.366 -r1.367
--- Engine.pm 23 Mar 2006 23:11:42 -0000 1.366
+++ Engine.pm 24 Mar 2006 00:11:51 -0000 1.367
@@ -1446,8 +1446,7 @@
my ($pkgspec, $package, $pkgname, $item, $dep);
my ($all_installed, $any_installed);
- my (%deps, @queue, @deplist, @requested, @additionals, @elist);
- my ($ep);
+ my (%deps, @queue, @deplist, @requested, @additionals);
my ($answer, $s);
my (%to_be_rebuilt, %already_activated);
@@ -1534,13 +1533,6 @@
return;
}
- # resolve dependencies for essential packages
- @elist = Fink::Package->list_essential_packages();
- foreach $ep (@elist) {
- # no virtual packages here
- $ep = [ Fink::Package->package_by_name($ep)->get_all_versions()
];
- }
-
# recursively expand dependencies
my %ok_versions; # versions of each pkg that are ok to use
my %conflicts; # pkgname => list of conflicts
@@ -1598,11 +1590,6 @@
# Do not use BuildConflicts for packages which are not
going to be built!
}
- # add essential packages (being careful about packages whose
parent is essential)
- # dev-tools is not Essential but it must not depend on
essentials because essentials must implicitly BDep:dev-tools
- if (not $item->[PKGVER]->built_with_essential and
$item->[PKGVER]->get_name() ne 'dev-tools') {
- push @deplist, @elist;
- }
foreach $dep (@deplist) {
choose_pkgversion(\%deps, [EMAIL PROTECTED], $item,
\%ok_versions, @$dep);
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1299
retrieving revision 1.1300
diff -u -d -r1.1299 -r1.1300
--- ChangeLog 23 Mar 2006 23:11:39 -0000 1.1299
+++ ChangeLog 24 Mar 2006 00:11:51 -0000 1.1300
@@ -1,5 +1,10 @@
2006-03-23 Dave Vasilevsky <[EMAIL PROTECTED]>
+ * Engine.pm: Remove implicit depends on essential, if there are any
+ problems cirdan will fix them :-)
+
+2006-03-23 Dave Vasilevsky <[EMAIL PROTECTED]>
+
* Finally.pm: Use a pretty OO interface.
* Finally/BuildConflicts.pm: New module for BuildConflicts removal and
restoration.
-------------------------------------------------------
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