Update of /cvsroot/fink/fink/perlmod/Fink
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13511
Modified Files:
ChangeLog Engine.pm
Log Message:
re-enable xterm bits, seems to work now that I am not accidentally creating
variables by interrogating them ;)
Index: Engine.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -d -r1.429 -r1.430
--- Engine.pm 21 Mar 2009 20:51:34 -0000 1.429
+++ Engine.pm 30 Mar 2009 20:04:25 -0000 1.430
@@ -2022,16 +2022,20 @@
### and to silence the dep engine so it
### only asks once at the begining
-# {
-# my $rebuild_count = 0;
-# for my $pkgname (keys %to_be_rebuilt) {
-# my $p =
$deps{$pkgname}->[PKGVER];
-# if (not defined $p or not
$p->has_parent) {
-# $rebuild_count +=
$to_be_rebuilt{$pkgname};
-# }
-# }
-# print "\033]2;building " .
$package->get_fullname . " (" . ($rebuild_count - 1) . " remaining)\007";
-# }
+ {
+ my $rebuild_count = 0;
+ for my $pkgname (keys %to_be_rebuilt) {
+ if (not exists $deps{$pkgname})
{
+ $rebuild_count++;
+ } else {
+ my $p =
$deps{$pkgname}->[PKGVER];
+ if (not defined $p or
not $p->has_parent) {
+ $rebuild_count
+= $to_be_rebuilt{$pkgname};
+ }
+ }
+ }
+ print "\033]2;building " .
$package->get_fullname . " (" . ($rebuild_count - 1) . " remaining)\007";
+ }
unless ($forceoff) {
### Double check it didn't already get
@@ -2972,7 +2976,7 @@
foreach my $dep (sort { $a->[PKGNAME] cmp $b->[PKGNAME] } @dep_items) {
my $func;
-# print "\033]2;pre-fetching " . $dep->[PKGVER]->get_fullname . "
(" . (int(@dep_items) - ++$count) . " remaining)\007";
+ print "\033]2;pre-fetching " . $dep->[PKGVER]->get_fullname . "
(" . (int(@dep_items) - ++$count) . " remaining)\007";
# What action do we take?
if (grep { $dep->[OP] == $_ } ($OP_REINSTALL, $OP_INSTALL)) {
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1581
retrieving revision 1.1582
diff -u -d -r1.1581 -r1.1582
--- ChangeLog 30 Mar 2009 04:29:38 -0000 1.1581
+++ ChangeLog 30 Mar 2009 20:04:25 -0000 1.1582
@@ -1,3 +1,7 @@
+2009-03-30 Benjamin Reed <rangerr...@users.sourceforge.net>
+
+ * Engine.pm: re-enable the xterm escapes, should be fixed now.
+
2009-03-30 Daniel Macks <dma...@netspace.org>
* Validation.pm: .info Patch and %a/*.patch are now fully deprecated
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
