From 2d7276a789a9ce2062c351afd27e33021c1ce5b1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 30 Dec 2013 17:36:55 +0100
Subject: ship/punani: fix TODOs regarding return values

---
 ship/TODO       | 4 +---
 ship/lib/punani | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'ship')

diff --git a/ship/TODO b/ship/TODO
index b929ca02..bc522b79 100644
--- a/ship/TODO
+++ b/ship/TODO
@@ -1,5 +1,3 @@
 # punani
 
-- error code should be false when package cannot be removed because it is not
-  installed
-- error code should be false when checking if a package is installed
+- pacman cannot automagically remove packages
diff --git a/ship/lib/punani b/ship/lib/punani
index ea05a4ec..512c732c 100644
--- a/ship/lib/punani
+++ b/ship/lib/punani
@@ -70,14 +70,14 @@ punani(){
         if punani_has $RES; then
           info "$RES already installed, skipping"
         else
-          punani_install $RES || error "cannot install $RES with $PACKER"
+          punani_install $RES || die "cannot install $RES with $PACKER"
         fi
         ;;
       remove)
         if ! punani_has $RES; then
           info "$RES not installed, skipping"
         else
-          punani_remove $RES || error "cannot install $RES with $PACKER"
+          punani_remove $RES || die "cannot install $RES with $PACKER"
         fi
         ;;
       has)
@@ -85,6 +85,7 @@ punani(){
           info "$RES is installed"
         else
           info "$RES is not installed"
+          exit 1
         fi
         ;;
       owner)
-- 
cgit v1.2.3