From f70e7601d2dd29a60521a6a5fded7890fb1bb2fe Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Tue, 20 Oct 2009 11:53:21 -0700
Subject: [PATCH] Use safe-upgrade with aptitude

---
 software/apt_upgrade.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/software/apt_upgrade.cgi b/software/apt_upgrade.cgi
index bf6d9a4dc..ba4edb102 100755
--- a/software/apt_upgrade.cgi
+++ b/software/apt_upgrade.cgi
@@ -30,7 +30,8 @@ if ($in{'update'}) {
 
 if ($in{'mode'}) {
 	$opts = $in{'sim'} ? "-s -y -f" : "-y -f";
-	$cmd = $in{'mode'} == 2 ? "dist-upgrade" : "upgrade";
+	$cmd = $in{'mode'} == 2 ? "dist-upgrade" :
+	       $apt_get_command =~ /aptitude/ ? "safe-upgrade" : "upgrade";
 	print "<b>",&text($in{'sim'} ? 'apt_upgradedescsim' : 'apt_upgradedesc', "<tt>$apt_get_command $opts $cmd</tt>"),"</b><p>\n";
 	print "<pre>";
 	&additional_log("exec", undef, "$apt_get_command $opts $cmd");