summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hartwig <mandyke@gmail.com>2012-05-26 19:20:42 +0800
committerDaniel Hartwig <mandyke@gmail.com>2012-05-26 19:20:42 +0800
commit52e889d8e0e9636e43c6147b7bd924e04d014528 (patch)
tree1f35c93bceffcf6af423a962715c299ad06565d1
parent31308ec2213de43bc2bee2e1c1467153ac2068fe (diff)
downloadaptitude-52e889d8e0e9636e43c6147b7bd924e04d014528.tar.gz
Update to tasks support: task packages, multi-arch, syntax
Task packages (introduced with tasksel 3.0) are meta-packages which define the dependencies of tasks. The packages themselves have always worked but the 'tasks' grouping policy and '?task' search term did not support them. This update corrects for this. As a result of this change to tasksel all Debian tasks now function exactly like meta-packages. (Closes: #382631) The syntax for installing tasks from the command line has been updated. It now supports specifying an arch and requires the same syntax as apt-utils ('^' must be the last part of the name). Examples: # aptitude install gnome-desktop^ # aptitude install ssh-server^:armel This avoids ambiguity that may arise when a task and package have the same name. Closes: #382631
-rw-r--r--NEWS3
-rw-r--r--src/cmdline/cmdline_do_action.cc2
-rw-r--r--src/cmdline/cmdline_simulate.cc2
-rw-r--r--src/main.cc2
4 files changed, 6 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 9d7b824b..4d28ad8d 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,9 @@ earlier releases.
* [all]: Changelog downloading is restored
(Closes: #669569, LP: #824708)
+ * [cmdline]: Exit with non-zero status when a package run is
+ aborted. (Closes: #293008)
+
- Cosmetic and UI bugs:
* [curses]: Adjust default widths of localized columns:
diff --git a/src/cmdline/cmdline_do_action.cc b/src/cmdline/cmdline_do_action.cc
index 739edfa0..8d088379 100644
--- a/src/cmdline/cmdline_do_action.cc
+++ b/src/cmdline/cmdline_do_action.cc
@@ -383,7 +383,7 @@ int cmdline_do_action(int argc, char *argv[],
policy, arch_only, term))
{
printf(_("Abort.\n"));
- return 0;
+ return 1;
}
aptitude::cmdline::apply_user_tags(user_tags);
diff --git a/src/cmdline/cmdline_simulate.cc b/src/cmdline/cmdline_simulate.cc
index a50d20c1..e63bd632 100644
--- a/src/cmdline/cmdline_simulate.cc
+++ b/src/cmdline/cmdline_simulate.cc
@@ -58,7 +58,7 @@ int cmdline_simulate(bool as_upgrade,
term_metrics))
{
printf(_("Abort.\n"));
- return 0;
+ return 1;
}
if(verbose==0)
diff --git a/src/main.cc b/src/main.cc
index ea90abed..511715aa 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1221,7 +1221,7 @@ int main(int argc, char *argv[])
catch(StdinEOFException)
{
printf("%s", _("Abort.\n"));
- return -1;
+ return 1;
}
catch(const cwidget::util::Exception &e)
{