ssh-import-id

Merge lp:~soren/ssh-import-id/collation into lp:~ssh-import-id/ssh-import-id/trunk.broke

  1. collation
  2. Merge into trunk.broke
Proposed by Soren Hansen
Status: Merged
Merged at revision: 38
Proposed branch: lp:~soren/ssh-import-id/collation
Merge into: lp:~ssh-import-id/ssh-import-id/trunk.broke
Diff against target: 11 lines (+1/-0)
1 file modified
ssh-import-id (+1/-0)
To merge this branch: bzr merge lp:~soren/ssh-import-id/collation
Reviewer Review Type Date Requested Status
ssh-import-id Pending
Review via email: mp+89011@code.launchpad.net

Commit message

Ensure sed uses a C locale during collation

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ssh-import-id'
2--- ssh-import-id 2012-01-16 23:40:25 +0000
3+++ ssh-import-id 2012-01-18 11:30:28 +0000
4@@ -59,6 +59,7 @@
5 validate_keys() {
6 # Prune blank lines, join lines that don't start with ^ssh-
7 # remove invalid characters
8+ LC_COLLATE=C \
9 sed -i -e '/^$/d' \
10 -e '/^\r/d' \
11 -e ':join /^ssh-/!{ N; s/[\n\r]//g ; b join }' \

Subscribers

People subscribed via source and target branches

to all changes: