Merge lp:~nuclearbob/utah/packaging-permissions into lp:utah

Proposed by Max Brustkern
Status: Merged
Approved by: Javier Collado
Approved revision: 917
Merged at revision: 916
Proposed branch: lp:~nuclearbob/utah/packaging-permissions
Merge into: lp:utah
Diff against target: 25 lines (+2/-2)
2 files modified
debian/utah-client.postinst (+1/-1)
debian/utah.postinst (+1/-1)
To merge this branch: bzr merge lp:~nuclearbob/utah/packaging-permissions
Reviewer Review Type Date Requested Status
Javier Collado (community) Approve
Max Brustkern (community) Needs Resubmitting
Andy Doan (community) Approve
Review via email: mp+164789@code.launchpad.net

Description of the change

When we merged this before, a chmod on $DIR/* would fail if the directory was empty. Since we were recursing anyway, I just do $DIR instead of $DIR/* now.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) :
review: Approve
Revision history for this message
Javier Collado (javier.collado) wrote :

The code looks good to me.

The only thing that I want to mention is that, since this is a fix over a
previous merge, I don't think a description should be added to the changelog
which I believe should be brief to keep it useful.

917. By Max Brustkern

Removed noisy changelog entry

Revision history for this message
Max Brustkern (nuclearbob) wrote :

I think Javier's comment regarding the changelog entry makes sense, so here's an update with that. If we don't have any further ideas, I can merge this.

review: Needs Resubmitting
Revision history for this message
Javier Collado (javier.collado) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/utah-client.postinst'
2--- debian/utah-client.postinst 2013-05-16 12:47:10 +0000
3+++ debian/utah-client.postinst 2013-05-21 13:03:29 +0000
4@@ -29,7 +29,7 @@
5 then
6 chown -R $SERVER_USER:$SERVER_GROUP $DIR
7 chmod 2775 $DIR
8- chmod -R ug+rw $DIR/*
9+ chmod -R ug+rw $DIR
10 fi
11 done
12 }
13
14=== modified file 'debian/utah.postinst'
15--- debian/utah.postinst 2013-05-16 18:22:03 +0000
16+++ debian/utah.postinst 2013-05-21 13:03:29 +0000
17@@ -73,7 +73,7 @@
18 then
19 chown -R $SERVER_USER:$SERVER_GROUP $DIR
20 chmod 2775 $DIR
21- chmod -R ug+rw $DIR/*
22+ chmod -R ug+rw $DIR
23 fi
24 done
25 }

Subscribers

People subscribed via source and target branches