From ffcb91fa04850b53d831d50146d08878889d3baa Mon Sep 17 00:00:00 2001 From: joey Date: Wed, 23 May 2007 18:03:47 +0000 Subject: [PATCH] * Show output of installation of package with -i, since some packages install scripts may have important output or even be interactive. Closes; #425732 --- Alien/Package/Deb.pm | 3 +++ Alien/Package/Pkg.pm | 3 +++ Alien/Package/Rpm.pm | 3 +++ Alien/Package/Slp.pm | 3 +++ Alien/Package/Tgz.pm | 3 +++ debian/changelog | 8 ++++++++ 6 files changed, 23 insertions(+) diff --git a/Alien/Package/Deb.pm b/Alien/Package/Deb.pm index cf373c7..d8a524a 100644 --- a/Alien/Package/Deb.pm +++ b/Alien/Package/Deb.pm @@ -87,8 +87,11 @@ sub install { my $this=shift; my $deb=shift; + my $v=$Alien::Package::verbose; + $Alien::Package::verbose=2; $this->do("dpkg", "--no-force-overwrite", "-i", $deb) or die "Unable to install"; + $Alien::Package::verbose=$v; } =item test diff --git a/Alien/Package/Pkg.pm b/Alien/Package/Pkg.pm index 67b33fd..b718aaf 100644 --- a/Alien/Package/Pkg.pm +++ b/Alien/Package/Pkg.pm @@ -106,8 +106,11 @@ sub install { my $pkg=shift; if (-x "/usr/sbin/pkgadd") { + my $v=$Alien::Package::verbose; + $Alien::Package::verbose=2; $this->do("/usr/sbin/pkgadd", "-d .", "$pkg") or die "Unable to install"; + $Alien::Package::verbose=$v; } else { die "Sorry, I cannot install the generated .pkg file because /usr/sbin/pkgadd is not present.\n"; diff --git a/Alien/Package/Rpm.pm b/Alien/Package/Rpm.pm index 9299901..4c67ed1 100644 --- a/Alien/Package/Rpm.pm +++ b/Alien/Package/Rpm.pm @@ -53,8 +53,11 @@ sub install { my $this=shift; my $rpm=shift; + my $v=$Alien::Package::verbose; + $Alien::Package::verbose=2; $this->do("rpm -ivh ".(exists $ENV{RPMINSTALLOPT} ? $ENV{RPMINSTALLOPT} : '').$rpm) or die "Unable to install"; + $Alien::Package::verbose=$v; } =item scan diff --git a/Alien/Package/Slp.pm b/Alien/Package/Slp.pm index 470dd74..85786fa 100644 --- a/Alien/Package/Slp.pm +++ b/Alien/Package/Slp.pm @@ -114,8 +114,11 @@ sub install { my $this=shift; my $slp=shift; + my $v=$Alien::Package::verbose; + $Alien::Package::verbose=2; $this->do("slpi", $slp) or die "Unable to install"; + $Alien::Package::verbose=$v; } =item getfooter diff --git a/Alien/Package/Tgz.pm b/Alien/Package/Tgz.pm index b68e056..4249886 100644 --- a/Alien/Package/Tgz.pm +++ b/Alien/Package/Tgz.pm @@ -66,8 +66,11 @@ sub install { my $tgz=shift; if (-x "/sbin/installpkg") { + my $v=$Alien::Package::verbose; + $Alien::Package::verbose=2; $this->do("/sbin/installpkg", "$tgz") or die "Unable to install"; + $Alien::Package::verbose=$v; } else { die "Sorry, I cannot install the generated .tgz file because /sbin/installpkg is not present. You can use tar to install it yourself.\n" diff --git a/debian/changelog b/debian/changelog index a0336d2..1c3af86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +alien (8.68) UNRELEASED; urgency=low + + * Show output of installation of package with -i, since some packages + install scripts may have important output or even be interactive. + Closes; #425732 + + -- Joey Hess Wed, 23 May 2007 13:44:42 -0400 + alien (8.67) unstable; urgency=low * Update the url to the web page, and remove several other broken urls from