about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Debian/Command/_aptitude2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cafbb811d..52d9cb471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 	* Vincent Lefevre: 32818: Completion/Unix/Command/_gzip:
 	--rsyncable option is missing
 
+	* Daniel Bolton: 32815: Completion/Debian/Command/_aptitude:
+	missing resolver options
+
 2014-07-03  Mikael Magnusson  <mikachu@gmail.com>
 
 	* 32821: Completion/Unix/Command/_gcc: Update _gcc as of GCC
diff --git a/Completion/Debian/Command/_aptitude b/Completion/Debian/Command/_aptitude
index 2c462e462..2cb211149 100644
--- a/Completion/Debian/Command/_aptitude
+++ b/Completion/Debian/Command/_aptitude
@@ -70,6 +70,8 @@ _arguments -C \
   '--schedule-only[schedule operations to be performed in the future]' \
   '--purge-unused[purge unused packages instead of removing]' \
   '--visual-preview[start up the visual interface and display its preview screen]' \
+  '--full-resolver[attempts to resolve conflicts with a higher risk of breakage]' \
+  '--safe-resolver[attempts to resolve conflicts with a lower risk of breakage]' \
   '-S[load the extended state information from non-standard state file]:state file:_files' \
   '-u[begin updating the package lists as soon as the program starts]' \
   '-i[displays a download preview when the program starts]' \