Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3305/perlmod/Fink
Modified Files:
ChangeLog Scanpackages.pm
Log Message:
start using capture
Index: Scanpackages.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Scanpackages.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Scanpackages.pm 20 Mar 2006 05:14:12 -0000 1.8
+++ Scanpackages.pm 21 Mar 2006 21:05:35 -0000 1.9
@@ -26,6 +26,7 @@
use warnings;
use strict;
+use Fink::CLI qw(capture);
use Fink::Command qw(mkdir_p);
use Fink::Services qw(latest_version);
@@ -349,23 +350,6 @@
return \%control;
}
-# Don't let an operation print to stdout or stderr
-#
-# _quietly($coderef);
-sub _quietly {
- my ($coderef) = @_;
-
- open my $oldout, '>&', STDOUT;
- open my $olderr, '>&', STDERR;
- open STDOUT, '>', '/dev/null';
- open STDERR, '>', '/dev/null';
- &$coderef();
- open STDOUT, '>&', $oldout;
- open STDERR, '>&', $olderr;
- close $oldout;
- close $olderr;
-}
-
# Make sure Fink is configured
#
# $sp->_ensure_fink;
@@ -392,9 +376,10 @@
require Fink::Package;
print STDERR "Loading Fink package database\n" if
$self->{verbosity};
- _quietly(sub {
+ my $dummy;
+ capture {
Fink::Package->require_packages;
- });
+ } \$dummy, \$dummy;
$self->{_pdb_loaded} = 1;
}
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1281
retrieving revision 1.1282
diff -u -d -r1.1281 -r1.1282
--- ChangeLog 21 Mar 2006 20:53:26 -0000 1.1281
+++ ChangeLog 21 Mar 2006 21:05:35 -0000 1.1282
@@ -1,5 +1,9 @@
2006-03-21 Dave Vasilevsky <[EMAIL PROTECTED]>
+ * Scanpackages.pm: Use CLI::capture to shut up Fink::Package.
+
+2006-03-21 Dave Vasilevsky <[EMAIL PROTECTED]>
+
* CLI.pm: Adjust prototype for &capture.
2006-03-21 Dave Vasilevsky <[EMAIL PROTECTED]>
-------------------------------------------------------
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
