1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
Description: Use the udunits files shipped in /usr/share/xml, not ones shipped with harp
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2018-06-16
Forwarded: no
--- a/python/_harppy.py
+++ b/python/_harppy.py
@@ -523,8 +523,9 @@
_encode_path(relpath))
if os.getenv('UDUNITS2_XML_PATH') is None:
- # Set udunits2 xml path relative to C library
- relpath = "../share/harp/udunits2.xml"
+ # Set udunits2 xml path
+ relpath = "../share/xml/udunits/udunits2.xml"
+
if _system() == "Windows":
_lib.harp_set_udunits2_xml_path_conditional(_encode_path(os.path.basename(clib)), _ffi.NULL,
_encode_path(relpath))
--- a/tools/harpcheck/harpcheck.c
+++ b/tools/harpcheck/harpcheck.c
@@ -105,7 +105,7 @@
fprintf(stderr, "ERROR: %s\n", harp_errno_to_string(harp_errno));
exit(1);
}
- if (harp_set_udunits2_xml_path_conditional(argv[0], NULL, "../share/harp/udunits2.xml") != 0)
+ if (harp_set_udunits2_xml_path_conditional(argv[0], NULL, "../share/xml/udunits/udunits2.xml") != 0)
{
fprintf(stderr, "ERROR: %s\n", harp_errno_to_string(harp_errno));
exit(1);
--- a/tools/harpcollocate/harpcollocate.c
+++ b/tools/harpcollocate/harpcollocate.c
@@ -176,7 +176,7 @@
fprintf(stderr, "ERROR: %s\n", harp_errno_to_string(harp_errno));
exit(1);
}
- if (harp_set_udunits2_xml_path_conditional(argv[0], NULL, "../share/harp/udunits2.xml") != 0)
+ if (harp_set_udunits2_xml_path_conditional(argv[0], NULL, "../share/xml/udunits/udunits2.xml") != 0)
{
fprintf(stderr, "ERROR: %s\n", harp_errno_to_string(harp_errno));
exit(1);
--- a/tools/harpconvert/harpconvert.c
+++ b/tools/harpconvert/harpconvert.c
@@ -264,7 +264,7 @@
fprintf(stderr, "ERROR: %s\n", harp_errno_to_string(harp_errno));
exit(1);
}
- if (harp_set_udunits2_xml_path_conditional(argv[0], NULL, "../share/harp/udunits2.xml") != 0)
+ if (harp_set_udunits2_xml_path_conditional(argv[0], NULL, "../share/xml/udunits/udunits2.xml") != 0)
{
fprintf(stderr, "ERROR: %s\n", harp_errno_to_string(harp_errno));
exit(1);
--- a/tools/harpdump/harpdump.c
+++ b/tools/harpdump/harpdump.c
@@ -360,7 +360,7 @@
fprintf(stderr, "ERROR: %s\n", harp_errno_to_string(harp_errno));
exit(1);
}
- if (harp_set_udunits2_xml_path_conditional(argv[0], NULL, "../share/harp/udunits2.xml") != 0)
+ if (harp_set_udunits2_xml_path_conditional(argv[0], NULL, "../share/xml/udunits/udunits2.xml") != 0)
{
fprintf(stderr, "ERROR: %s\n", harp_errno_to_string(harp_errno));
exit(1);
--- a/tools/harpmerge/harpmerge.c
+++ b/tools/harpmerge/harpmerge.c
@@ -365,7 +365,7 @@
fprintf(stderr, "ERROR: %s\n", harp_errno_to_string(harp_errno));
exit(1);
}
- if (harp_set_udunits2_xml_path_conditional(argv[0], NULL, "../share/harp/udunits2.xml") != 0)
+ if (harp_set_udunits2_xml_path_conditional(argv[0], NULL, "../share/xml/udunits/udunits2.xml") != 0)
{
fprintf(stderr, "ERROR: %s\n", harp_errno_to_string(harp_errno));
exit(1);
|
