ubuntuone-credentials

Merge lp:~dobey/ubuntuone-credentials/fix-migration into lp:ubuntuone-credentials

  1. fix-migration
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: Antti Kaijanmäki
Approved revision: 242
Merged at revision: 242
Proposed branch: lp:~dobey/ubuntuone-credentials/fix-migration
Merge into: lp:ubuntuone-credentials
Diff against target: 25 lines (+3/-2)
1 file modified
acl-updater/acl-updater (+3/-2)
To merge this branch: bzr merge lp:~dobey/ubuntuone-credentials/fix-migration
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) Approve
Ted Gould (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+295625@code.launchpad.net

Commit message

Don't exit 1 on non-errors, and set -e to exit on normal errors.

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'acl-updater/acl-updater'
2--- acl-updater/acl-updater 2015-04-01 14:26:33 +0000
3+++ acl-updater/acl-updater 2016-05-24 20:40:56 +0000
4@@ -1,5 +1,6 @@
5 #!/bin/sh
6 #
7+set -e
8
9 export LC_ALL=C
10 SIGNON_DB="$HOME/.config/signond/signon.db"
11@@ -7,12 +8,12 @@
12 ACCOUNT_ID=`account-console list | grep -i ubuntuone | grep -o '[0-9]\+'`
13 if [ -z $ACCOUNT_ID ]; then
14 echo "no U1 account found; exiting"
15- exit 1
16+ exit 0
17 fi
18 CREDS_ID=`account-console show $ACCOUNT_ID | grep CredentialsId | grep -o '[0-9]\+'`
19 if [ -z $CREDS_ID ]; then
20 echo "no U1 account found; exiting"
21- exit 1
22+ exit 0
23 fi
24
25 echo "Upgrading ACL for U1 account (id:$CREDS_ID)"

Subscribers

People subscribed via source and target branches

to all changes: