summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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)
{