diff options
| author | Victor Lowther <victor.lowther@gmail.com> | 2008-03-01 18:09:53 -0600 |
|---|---|---|
| committer | Victor Lowther <victor.lowther@gmail.com> | 2008-03-01 18:09:53 -0600 |
| commit | 9022cb6113a910ae559cbb3a3833f07107df400d (patch) | |
| tree | 136fcfb14cdbec772a384cb64fd2dc168fcd0cf4 /src | |
| parent | f33864caecfea67be95abf0719e96861d6c243b3 (diff) | |
| parent | 9343bda51f8feff514b2bd0430c6435ee7466148 (diff) | |
Merge branch 'master' into vlowther-move-pm-main
Conflicts:
src/pm-action.in
Diffstat (limited to 'src')
| -rw-r--r-- | src/pm-action.in | 2 | ||||
| -rw-r--r-- | src/pm-is-supported.in | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/pm-action.in b/src/pm-action.in index 990f03c..787ad01 100644 --- a/src/pm-action.in +++ b/src/pm-action.in @@ -108,5 +108,3 @@ rm -f "${INHIBIT}" run_hooks sleep "$ACTION" "do_$ACTION" reverse "$REVERSE" - -exit $? diff --git a/src/pm-is-supported.in b/src/pm-is-supported.in index 9e72f9f..bfce1ae 100644 --- a/src/pm-is-supported.in +++ b/src/pm-is-supported.in @@ -28,10 +28,8 @@ ARG="$(echo ${1#--}|tr - _)" case "$ARG" in suspend|hibernate|suspend_hybrid) - "check_$ARG"; exit $? ;; + "check_$ARG" ;; help) help_options ;; *) help_options 1>&2 exit 1 ;; esac - -exit 0 |