Merge lp:~jontai/openvista-gtm-integration/bug512995 into lp:openvista-gtm-integration

Proposed by Jon Tai
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jontai/openvista-gtm-integration/bug512995
Merge into: lp:openvista-gtm-integration
Diff against target: 21 lines (+7/-2)
1 file modified
scripts/usr/bin/ovimport (+7/-2)
To merge this branch: bzr merge lp:~jontai/openvista-gtm-integration/bug512995
Reviewer Review Type Date Requested Status
jeff.apple Approve
Review via email: mp+18966@code.launchpad.net
To post a comment you must log in.
Revision history for this message
jeff.apple (jeff-apple) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/usr/bin/ovimport'
2--- scripts/usr/bin/ovimport 2010-02-09 23:23:02 +0000
3+++ scripts/usr/bin/ovimport 2010-02-10 00:32:14 +0000
4@@ -165,10 +165,15 @@
5 if [ -f "$globals" ]; then
6 # FIXME: handle compressed files
7
8- if awk '{ if (NR == 3) { print $0; exit 0 } }' "$globals" | grep -F '=' > /dev/null; then
9+ # second line ends with ZWR
10+ if awk '{ if (NR == 2) { print $0; exit 0 } }' "$globals" | grep ' ZWR$' > /dev/null; then
11 globals_format=ZWR
12- else
13+ # third line starts with ^
14+ elif awk '{ if (NR == 3) { print $0; exit 0 } }' "$globals" | grep '^^' > /dev/null; then
15 globals_format=GO
16+ else
17+ echo "ovimport: $globals: Unrecognized file format" >&2
18+ exit 3
19 fi
20
21 if head "$globals" | grep -E $'\r$' > /dev/null; then

Subscribers

People subscribed via source and target branches