From 95ed32885421a4158c603f640862843c0c0ee480 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 3 Mar 2009 16:59:00 +0000
Subject: (install) add more callbacks for installer

---
 NEWS              | 1 +
 urpm/install.pm   | 2 ++
 urpm/main_loop.pm | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/NEWS b/NEWS
index a280d1a0..29fa8925 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 - drop support for /etc/urpmi/media.d/*.cfg
   (was partially broken, non documented and hopefully unused)
+- add more callbacks for installer
 - fix reading descriptions with --env=
 - only load LDAP binding if needed (saves a couple MB in rpmdrake)
 - gurpmi:
diff --git a/urpm/install.pm b/urpm/install.pm
index 86d789fd..7598d6fe 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -227,12 +227,14 @@ sub install {
 	$options{callback_open} = sub {
 	    my ($_data, $_type, $id) = @_;
 	    $index++;
+	    $options{callback_open_helper} and $options{callback_open_helper}->(@_);
 	    $fh = urpm::sys::open_safe($urpm, '<', $install->{$id} || $upgrade->{$id});
 	    $fh ? fileno $fh : undef;
 	};
 	$options{callback_close} = sub {
 	    my ($urpm, undef, $pkgid) = @_;
 	    return unless defined $pkgid;
+	    $options{callback_close_helper} and $options{callback_close_helper}->(@_);
 	    get_README_files($urpm, $trans, $urpm->{depslist}[$pkgid]);
 	    close $fh if defined $fh;
 	};
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index c497027c..74e860dd 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -220,10 +220,13 @@ foreach my $set (@{$state->{transaction} || []}) {
 		urpm::install::options($urpm),
 		test => $test,
 		verbose => $options{verbose},
+		script_fd => $urpm->{options}{script_fd},
 		oldpackage => $state->{oldpackage},
 		justdb => $options{justdb},
 		replacepkgs => $options{replacepkgs},
+		callback_close_helper => $callbacks->{close_helper},
 		callback_inst => $callbacks->{inst},
+		callback_open_helper => $callbacks->{open_helper},
 		callback_trans => $callbacks->{trans},
 		callback_report_uninst => $callbacks->{callback_report_uninst},
 		raw_message => 1,
-- 
cgit v1.2.1