← Back to branch summary

~ubuntu-branches/ubuntu/quantal/lsb/quantal-proposed

« back to all changes in this revision

Viewing changes to lsb-base-logging-ubuntu.sh

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2006-11-21 11:18:27 UTC
  • Revision ID: james.westby@ubuntu.com-20061121111827-j63sb1imu6pr71ql
Tags: 3.1-22ubuntu1
* Resynchronise with Debian. Remaining changes:
  - Depend on postfix rather than exim4 as preferred mail-transport-agent
    alternative.
  - Depend on libgl1-mesa-glx rather than libgl1-mesa as preferred libgl1
    alternative.
  - Add Ubuntu logging functions.
  - Drop the optional lsb-qt4 module to a suggests.
* Make log_action_end_msg always return zero, per
  debian/lsb-base.README.Debian.
* "ok" -> "OK" (closes: Malone #19245).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lsb-base-logging-ubuntu.sh
120
120
 
121
121
    if log_use_usplash; then
122
122
        if [ "$1" -eq 0 ]; then
123
 
            usplash_write "SUCCESS ok" || true
 
123
            usplash_write "SUCCESS OK" || true
124
124
        else
125
125
            usplash_write "FAILURE failed" || true
126
126
        fi
132
132
        printf "\r"
133
133
        $TPUT hpa $COL
134
134
        if [ "$1" -eq 0 ]; then
135
 
            echo "[ ok ]"
 
135
            echo "[ OK ]"
136
136
        else
137
137
            printf '['
138
138
            $TPUT setaf 1 # red
170
170
 
171
171
log_action_end_msg () {
172
172
    # In the future this may do something with $2 as well.
173
 
    log_end_msg "$1"
 
173
    log_end_msg "$1" || true
174
174
}