1
=== modified file 'tests/platform/test_filesystem_notifications.py'
2
--- tests/platform/test_filesystem_notifications.py	2011-08-25 18:27:25 +0000
3
+++ tests/platform/test_filesystem_notifications.py	2011-10-03 14:06:49 +0000
4
@@ -20,9 +20,9 @@
5
20
20
6
21
import logging
21
import logging
7
22
import os
22
import os
8
23
import unittest
9
24
23
10
25
from twisted.internet import defer, reactor
24
from twisted.internet import defer, reactor
11
25
from twisted.trial import unittest
12
26
from ubuntuone.devtools.handlers import MementoHandler
26
from ubuntuone.devtools.handlers import MementoHandler
13
27
27
14
28
from tests.platform import _GeneralINotifyProcessor
28
from tests.platform import _GeneralINotifyProcessor
15
@@ -36,6 +36,7 @@
16
36
from ubuntuone.syncdaemon import (
36
from ubuntuone.syncdaemon import (
17
37
    event_queue,
37
    event_queue,
18
38
    filesystem_manager,
38
    filesystem_manager,
19
39
    filesystem_notifications,
20
39
)
40
)
21
40
41
22
41
class IgnoreFileTests(unittest.TestCase):
42
class IgnoreFileTests(unittest.TestCase):
23
@@ -72,6 +73,17 @@
24
72
        self.assertFalse(p.is_ignored("--foo--"))
73
        self.assertFalse(p.is_ignored("--foo--"))
25
73
        self.assertFalse(p.is_ignored("otherstuff"))
74
        self.assertFalse(p.is_ignored("otherstuff"))
26
74
75
27
76
    def test_is_ignored_uses_access(self):
28
77
        """Test that the right access function is called."""
29
78
        sample_path = "sample path"
30
79
        calls = []
31
80
        store_call = lambda *args: calls.append(args)
32
81
        self.patch(filesystem_notifications, "access", store_call)
33
82
        self.patch(filesystem_notifications, "path_exists", lambda _: True)
34
83
        p = _GeneralINotifyProcessor(None)
35
84
        p.is_ignored(sample_path)
36
85
        self.assertEqual(calls, [(sample_path,)])
37
86
38
75
87
39
76
class BaseFSMonitorTestCase(BaseTwistedTestCase):
88
class BaseFSMonitorTestCase(BaseTwistedTestCase):
40
77
    """Test the structures where we have the path/watch."""
89
    """Test the structures where we have the path/watch."""
41
78
90
42
=== modified file 'tests/syncdaemon/test_config.py'
43
--- tests/syncdaemon/test_config.py	2011-08-24 16:24:01 +0000
44
+++ tests/syncdaemon/test_config.py	2011-10-03 14:06:49 +0000
45
@@ -1,4 +1,5 @@
47
1
#
1
# encoding: utf-8
48
2
49
2
# Author: Guillermo Gonzalez <guillermo.gonzalez@canonical.com>
3
# Author: Guillermo Gonzalez <guillermo.gonzalez@canonical.com>
50
3
#
4
#
51
4
# Copyright 2009 Canonical Ltd.
5
# Copyright 2009 Canonical Ltd.
52
@@ -19,10 +20,13 @@
53
19
20
54
20
import logging
21
import logging
55
21
import os
22
import os
56
23
import sys
57
22
24
58
23
from ConfigParser import ConfigParser
25
from ConfigParser import ConfigParser
59
24
from twisted.internet import defer
26
from twisted.internet import defer
60
27
from twisted.trial.unittest import TestCase
61
25
28
62
29
from ubuntuone.devtools.testcase import skipIfOS
63
26
from ubuntuone.platform import open_file, path_exists
30
from ubuntuone.platform import open_file, path_exists
64
27
from ubuntu_sso.xdg_base_directory import (
31
from ubuntu_sso.xdg_base_directory import (
65
28
    xdg_data_home,
32
    xdg_data_home,
66
@@ -471,6 +475,25 @@
67
471
        self.assertEqual(conf.get_max_payload_size(), 666)
475
        self.assertEqual(conf.get_max_payload_size(), 666)
68
472
476
69
473
477
70
478
class UnicodePathsTestCase(TestCase):
71
479
    """Tests for unicode paths."""
72
480
73
481
    @skipIfOS('linux2', 'On linux paths are bytes so this test does not apply')
74
482
    def test_get_config_files_path_encoding(self):
75
483
        """Check that get_config_files uses paths in the right encoding."""
76
484
        temp = self.mktemp()
77
485
        fake_path = os.path.join(temp, u"Ñandú")
78
486
        native_dir = fake_path.encode(sys.getfilesystemencoding())
79
487
        os.makedirs(native_dir)
80
488
        with open(os.path.join(native_dir, config.CONFIG_FILE), "w") as f:
81
489
            f.write("this is a fake config file")
82
490
        fake_load_config_paths = lambda _: [fake_path.encode("utf8")]
83
491
        self.patch(config, "load_config_paths", fake_load_config_paths)
84
492
        config_files = config.get_config_files()
85
493
        branch_config = os.path.join(native_dir, config.CONFIG_FILE)
86
494
        self.assertIn(branch_config, config_files)
87
495
88
496
89
474
class ConfigglueParsersTests(BaseTwistedTestCase):
497
class ConfigglueParsersTests(BaseTwistedTestCase):
90
475
    """Tests for our custom configglue parsers."""
498
    """Tests for our custom configglue parsers."""
91
476
499
92
477
500
93
=== modified file 'tests/syncdaemon/test_vm.py'
94
--- tests/syncdaemon/test_vm.py	2011-09-06 17:13:11 +0000
95
+++ tests/syncdaemon/test_vm.py	2011-10-03 14:06:49 +0000
96
@@ -25,6 +25,7 @@
97
25
import inspect
25
import inspect
98
26
import logging
26
import logging
99
27
import os
27
import os
100
28
import sys
101
28
import uuid
29
import uuid
102
29
30
103
30
from mocker import Mocker, MATCH
31
from mocker import Mocker, MATCH
104
@@ -35,6 +36,7 @@
105
35
    FakeMain,
36
    FakeMain,
106
36
)
37
)
107
37
from ubuntuone.devtools.handlers import MementoHandler
38
from ubuntuone.devtools.handlers import MementoHandler
108
39
from ubuntuone.devtools.testcase import skipIfOS
109
38
from ubuntuone.storageprotocol import volumes, request
40
from ubuntuone.storageprotocol import volumes, request
110
39
from ubuntuone.storageprotocol.client import ListShares
41
from ubuntuone.storageprotocol.client import ListShares
111
40
from ubuntuone.storageprotocol.sharersp import (
42
from ubuntuone.storageprotocol.sharersp import (
112
@@ -3887,6 +3889,39 @@
113
3887
            self.md_upgrader._upgrade_metadata_5(6)
3889
            self.md_upgrader._upgrade_metadata_5(6)
114
3888
3890
115
3889
3891
116
3892
@skipIfOS('linux2', 'On linux paths are bytes so this tests do not apply')
117
3893
class MetadataVersionFileTestCase(MetadataTestCase):
118
3894
    """Check that the metadata version file can have unicode characters."""
119
3895
120
3896
    @defer.inlineCallbacks
121
3897
    def setUp(self):
122
3898
        """Initialize this testcase."""
123
3899
        yield super(MetadataVersionFileTestCase, self).setUp()
124
3900
        self.fake_version = "FAKE"
125
3901
        self.patch(VolumeManager, "METADATA_VERSION", self.fake_version)
126
3902
        self.temp_dir = os.path.join(self.mktemp(), u"Ñandú")
127
3903
        self.version_file = os.path.join(self.temp_dir, ".version").encode(
128
3904
                                                 sys.getfilesystemencoding())
129
3905
        self.md_upgrader = MetadataUpgrader(self.temp_dir.encode("utf-8"),
130
3906
                                            "", "", "", "", "", "", None)
131
3907
132
3908
    def test_metadata_version_write(self):
133
3909
        """The metadata .version file is written on unicode paths."""
134
3910
        self.md_upgrader.update_metadata_version()
135
3911
136
3912
        with open(self.version_file) as fh:
137
3913
            result = fh.read().strip()
138
3914
        self.assertEqual(result, self.fake_version)
139
3915
140
3916
    def test_metadata_version_read(self):
141
3917
        """The metadata .version file is read from unicode paths."""
142
3918
        with open(self.version_file, "w") as fh:
143
3919
            fh.write(self.fake_version)
144
3920
145
3921
        result = self.md_upgrader._get_md_version()
146
3922
        self.assertEqual(result, self.fake_version)
147
3923
148
3924
149
3890
class VMTritcaskShelfTests(BaseTwistedTestCase):
3925
class VMTritcaskShelfTests(BaseTwistedTestCase):
150
3891
    """Tests for VMTritcaskShelf."""
3926
    """Tests for VMTritcaskShelf."""
151
3892
3927
152
3893
3928
153
=== modified file 'ubuntuone/platform/linux/__init__.py'
154
--- ubuntuone/platform/linux/__init__.py	2011-08-17 12:43:42 +0000
155
+++ ubuntuone/platform/linux/__init__.py	2011-10-03 14:06:49 +0000
156
@@ -37,6 +37,7 @@
157
37
    make_dir,
37
    make_dir,
158
38
    make_link,
38
    make_link,
159
39
    move_to_trash,
39
    move_to_trash,
160
40
    native_rename,
161
40
    normpath,
41
    normpath,
162
41
    open_file,
42
    open_file,
163
42
    path_exists,
43
    path_exists,
164
43
44
165
=== modified file 'ubuntuone/platform/linux/os_helper.py'
166
--- ubuntuone/platform/linux/os_helper.py	2011-08-22 13:31:56 +0000
167
+++ ubuntuone/platform/linux/os_helper.py	2011-10-03 14:06:49 +0000
168
@@ -115,6 +115,11 @@
169
115
    os.rename(path_from, path_to)
115
    os.rename(path_from, path_to)
170
116
116
171
117
117
172
118
def native_rename(path_from, path_to):
173
119
    """Rename a file or directory."""
174
120
    os.rename(path_from, path_to)
175
121
176
122
177
118
def recursive_move(path_from, path_to):
123
def recursive_move(path_from, path_to):
178
119
    """Perform a recursive move."""
124
    """Perform a recursive move."""
179
120
    shutil.move(path_from, path_to)
125
    shutil.move(path_from, path_to)
180
121
126
181
=== modified file 'ubuntuone/platform/windows/__init__.py'
182
--- ubuntuone/platform/windows/__init__.py	2011-08-17 12:43:42 +0000
183
+++ ubuntuone/platform/windows/__init__.py	2011-10-03 14:06:49 +0000
184
@@ -36,6 +36,7 @@
185
36
    make_dir,
36
    make_dir,
186
37
    make_link,
37
    make_link,
187
38
    move_to_trash,
38
    move_to_trash,
188
39
    native_rename,
189
39
    normpath,
40
    normpath,
190
40
    open_file,
41
    open_file,
191
41
    path_exists,
42
    path_exists,
192
42
43
193
=== modified file 'ubuntuone/platform/windows/os_helper.py'
194
--- ubuntuone/platform/windows/os_helper.py	2011-09-01 10:53:13 +0000
195
+++ ubuntuone/platform/windows/os_helper.py	2011-10-03 14:06:49 +0000
196
@@ -568,11 +568,11 @@
197
568
@windowspath(path_indexes=[0, 1])
568
@windowspath(path_indexes=[0, 1])
198
569
def rename(path_from, path_to):
569
def rename(path_from, path_to):
199
570
    """Rename a file or directory."""
570
    """Rename a file or directory."""
205
571
    return _rename(path_from, path_to)
571
    return native_rename(path_from, path_to)
206
572
572
207
573
573
208
574
def _rename(path_from, path_to):
574
def native_rename(path_from, path_to):
209
575
    """Rename a file or directory."""
575
    """Rename a file or directory, using native paths."""
210
576
    # No need to do any specific handling for invalid characters since
576
    # No need to do any specific handling for invalid characters since
211
577
    # 'path_from' and 'path_to' are valid windows paths.
577
    # 'path_from' and 'path_to' are valid windows paths.
212
578
    # Also, to ensure the same behaviors as on linux, use the MoveFileExW function
578
    # Also, to ensure the same behaviors as on linux, use the MoveFileExW function
213
@@ -598,7 +598,7 @@
214
598
        if os.path.isdir(path_to):
598
        if os.path.isdir(path_to):
215
599
            path_to = os.path.join(path_to, os.path.basename(path_from))
599
            path_to = os.path.join(path_to, os.path.basename(path_from))
216
600
        try:
600
        try:
218
601
            _rename(path_from, path_to)
601
            native_rename(path_from, path_to)
219
602
        except OSError, e:
602
        except OSError, e:
220
603
            raise IOError(e.errno, str(e))
603
            raise IOError(e.errno, str(e))
221
604
    else:
604
    else:
222
605
605
223
=== modified file 'ubuntuone/platform/xdg_base_directory/__init__.py'
224
--- ubuntuone/platform/xdg_base_directory/__init__.py	2011-08-24 16:24:01 +0000
225
+++ ubuntuone/platform/xdg_base_directory/__init__.py	2011-10-03 14:06:49 +0000
226
@@ -18,8 +18,11 @@
227
18
18
228
19
import os
19
import os
229
20
20
231
21
from ubuntu_sso.xdg_base_directory import xdg_cache_home
21
from ubuntu_sso.xdg_base_directory import xdg_cache_home, native_path
232
22
22
233
23
# All usage of the ubuntuone_log_dir is for native access,
234
24
# so we only change it here
235
23
ubuntuone_log_dir = os.path.join(xdg_cache_home, 'ubuntuone', 'log')
25
ubuntuone_log_dir = os.path.join(xdg_cache_home, 'ubuntuone', 'log')
236
26
ubuntuone_log_dir = native_path(ubuntuone_log_dir)
237
24
if not os.path.exists(ubuntuone_log_dir):
27
if not os.path.exists(ubuntuone_log_dir):
238
25
    os.makedirs(ubuntuone_log_dir)
28
    os.makedirs(ubuntuone_log_dir)
239
26
29
240
=== modified file 'ubuntuone/syncdaemon/config.py'
241
--- ubuntuone/syncdaemon/config.py	2011-08-24 16:24:01 +0000
242
+++ ubuntuone/syncdaemon/config.py	2011-10-03 14:06:49 +0000
243
@@ -25,9 +25,15 @@
244
25
25
245
26
from ConfigParser import NoOptionError, NoSectionError
26
from ConfigParser import NoOptionError, NoSectionError
246
27
from optparse import OptionParser
27
from optparse import OptionParser
248
28
from ubuntuone.platform import path_exists, rename
28
# We should not use standard functions from os_helper here,
249
29
# because the configglue superclasses do not use them.
250
30
# Instead, all paths used in this module should be "native",
251
31
# that is: utf8 str on linux, or (unicode or mbcs str) on windows
252
32
from ubuntuone.platform import native_rename
253
29
from ubuntu_sso.xdg_base_directory import (
33
from ubuntu_sso.xdg_base_directory import (
254
30
    load_config_paths,
34
    load_config_paths,
255
35
    native_path,
256
36
    syncdaemon_path,
257
31
    save_config_path,
37
    save_config_path,
258
32
    xdg_data_home,
38
    xdg_data_home,
259
33
    xdg_cache_home,
39
    xdg_cache_home,
260
@@ -70,7 +76,8 @@
261
70
logger = logging.getLogger('ubuntuone.SyncDaemon.config')
76
logger = logging.getLogger('ubuntuone.SyncDaemon.config')
262
71
77
263
72
# get (and possibly create if don't exists) the user config file
78
# get (and possibly create if don't exists) the user config file
265
73
_user_config_path = os.path.join(save_config_path('ubuntuone'), CONFIG_FILE)
79
_user_config_path = os.path.join(native_path(save_config_path('ubuntuone')),
266
80
                                 CONFIG_FILE)
267
74
81
268
75
# module private config instance.
82
# module private config instance.
269
76
# this object is the shared config
83
# this object is the shared config
270
@@ -85,7 +92,7 @@
271
85
    Return the path using user home + value.
92
    Return the path using user home + value.
272
86
93
273
87
    """
94
    """
275
88
    result = os.path.expanduser(path_from_unix(value))
95
    result = syncdaemon_path(os.path.expanduser(path_from_unix(value)))
276
89
    assert isinstance(result, str)
96
    assert isinstance(result, str)
277
90
    return result
97
    return result
278
91
98
279
@@ -151,12 +158,13 @@
280
151
    """
158
    """
281
152
    config_files = []
159
    config_files = []
282
153
    for xdg_config_dir in load_config_paths('ubuntuone'):
160
    for xdg_config_dir in load_config_paths('ubuntuone'):
283
161
        xdg_config_dir = native_path(xdg_config_dir)
284
154
        config_file = os.path.join(xdg_config_dir, CONFIG_FILE)
162
        config_file = os.path.join(xdg_config_dir, CONFIG_FILE)
286
155
        if path_exists(config_file):
163
        if os.path.exists(config_file):
287
156
            config_files.append(config_file)
164
            config_files.append(config_file)
288
157
165
289
158
        config_logs = os.path.join(xdg_config_dir, CONFIG_LOGS)
166
        config_logs = os.path.join(xdg_config_dir, CONFIG_LOGS)
291
159
        if path_exists(config_logs):
167
        if os.path.exists(config_logs):
292
160
            config_files.append(config_logs)
168
            config_files.append(config_logs)
293
161
169
294
162
    # reverse the list as load_config_paths returns the user dir first
170
    # reverse the list as load_config_paths returns the user dir first
295
@@ -164,11 +172,11 @@
296
164
    # if we are running from a branch, get the config files from it too
172
    # if we are running from a branch, get the config files from it too
297
165
    config_file = os.path.join(os.path.dirname(__file__), os.path.pardir,
173
    config_file = os.path.join(os.path.dirname(__file__), os.path.pardir,
298
166
                               os.path.pardir, 'data', CONFIG_FILE)
174
                               os.path.pardir, 'data', CONFIG_FILE)
300
167
    if path_exists(config_file):
175
    if os.path.exists(config_file):
301
168
        config_files.append(config_file)
176
        config_files.append(config_file)
302
169
177
303
170
    config_logs = os.path.join('data', CONFIG_LOGS)
178
    config_logs = os.path.join('data', CONFIG_LOGS)
305
171
    if path_exists(config_logs):
179
    if os.path.exists(config_logs):
306
172
        config_files.append(config_logs)
180
        config_files.append(config_logs)
307
173
181
308
174
    return config_files
182
    return config_files
309
@@ -293,9 +301,9 @@
310
293
                self.remove_section(section)
301
                self.remove_section(section)
311
294
        with open(self.config_file + '.new', 'w') as fp:
302
        with open(self.config_file + '.new', 'w') as fp:
312
295
            self.write(fp)
303
            self.write(fp)
316
296
        if path_exists(self.config_file):
304
        if os.path.exists(self.config_file):
317
297
            rename(self.config_file, self.config_file + '.old')
305
            native_rename(self.config_file, self.config_file + '.old')
318
298
        rename(self.config_file + '.new', self.config_file)
306
        native_rename(self.config_file + '.new', self.config_file)
319
299
307
320
300
    def get_parsed(self, section, option):
308
    def get_parsed(self, section, option):
321
301
        """get that fallbacks to our custom defaults"""
309
        """get that fallbacks to our custom defaults"""
322
302
310
323
=== modified file 'ubuntuone/syncdaemon/filesystem_notifications.py'
324
--- ubuntuone/syncdaemon/filesystem_notifications.py	2011-08-09 12:56:06 +0000
325
+++ ubuntuone/syncdaemon/filesystem_notifications.py	2011-10-03 14:06:49 +0000
326
@@ -19,7 +19,7 @@
327
19
import os
19
import os
328
20
import re
20
import re
329
21
21
331
22
from ubuntuone.platform import path_exists
22
from ubuntuone.platform import access, path_exists
332
23
from ubuntuone.syncdaemon.mute_filter import MuteFilter
23
from ubuntuone.syncdaemon.mute_filter import MuteFilter
333
24
from ubuntuone import logger
24
from ubuntuone import logger
334
25
# our logging level
25
# our logging level
335
@@ -97,7 +97,7 @@
336
97
        # check first if the platform code knows hat to do with it
97
        # check first if the platform code knows hat to do with it
337
98
        if not self.platform_is_ignored(path):
98
        if not self.platform_is_ignored(path):
338
99
            # check if we can read
99
            # check if we can read
340
100
            if path_exists(path) and not os.access(path, os.R_OK):
100
            if path_exists(path) and not access(path):
341
101
                self.log.warning("Ignoring path as we don't have enough "
101
                self.log.warning("Ignoring path as we don't have enough "
342
102
                                 "permissions to track it: %r", path)
102
                                 "permissions to track it: %r", path)
343
103
                return True
103
                return True
344
104
104
345
=== modified file 'ubuntuone/syncdaemon/main.py'
346
--- ubuntuone/syncdaemon/main.py	2011-08-25 20:20:23 +0000
347
+++ ubuntuone/syncdaemon/main.py	2011-10-03 14:06:49 +0000
348
@@ -24,6 +24,7 @@
349
24
24
350
25
from twisted.internet import defer, reactor, task
25
from twisted.internet import defer, reactor, task
351
26
26
352
27
from ubuntu_sso.xdg_base_directory import native_path
353
27
from ubuntuone.syncdaemon import (
28
from ubuntuone.syncdaemon import (
354
28
    action_queue,
29
    action_queue,
355
29
    config,
30
    config,
356
@@ -84,7 +85,7 @@
357
84
        self.shares_dir_link = os.path.join(self.root_dir, shares_symlink_name)
85
        self.shares_dir_link = os.path.join(self.root_dir, shares_symlink_name)
358
85
        self.data_dir = data_dir
86
        self.data_dir = data_dir
359
86
        self.partials_dir = partials_dir
87
        self.partials_dir = partials_dir
361
87
        self.tritcask_dir = os.path.join(self.data_dir, 'tritcask')
88
        tritcask_dir = os.path.join(self.data_dir, 'tritcask')
362
88
        self.logger = logging.getLogger('ubuntuone.SyncDaemon.Main')
89
        self.logger = logging.getLogger('ubuntuone.SyncDaemon.Main')
363
89
        user_config = config.get_user_config()
90
        user_config = config.get_user_config()
364
90
        if read_limit is None:
91
        if read_limit is None:
365
@@ -99,7 +100,7 @@
366
99
        self.logger.info("Using %r as root dir", self.root_dir)
100
        self.logger.info("Using %r as root dir", self.root_dir)
367
100
        self.logger.info("Using %r as data dir", self.data_dir)
101
        self.logger.info("Using %r as data dir", self.data_dir)
368
101
        self.logger.info("Using %r as shares root dir", self.shares_dir)
102
        self.logger.info("Using %r as shares root dir", self.shares_dir)
370
102
        self.db = tritcask.Tritcask(self.tritcask_dir)
103
        self.db = tritcask.Tritcask(native_path(tritcask_dir))
371
103
        self.vm = volume_manager.VolumeManager(self)
104
        self.vm = volume_manager.VolumeManager(self)
372
104
        self.fs = filesystem_manager.FileSystemManager(
105
        self.fs = filesystem_manager.FileSystemManager(
373
105
            data_dir, partials_dir, self.vm, self.db)
106
            data_dir, partials_dir, self.vm, self.db)
374
106
107
375
=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
376
--- ubuntuone/syncdaemon/volume_manager.py	2011-09-06 17:13:11 +0000
377
+++ ubuntuone/syncdaemon/volume_manager.py	2011-10-03 14:06:49 +0000
378
@@ -54,6 +54,7 @@
379
54
    listdir,
54
    listdir,
380
55
    make_dir,
55
    make_dir,
381
56
    normpath,
56
    normpath,
382
57
    open_file,
383
57
    path_exists,
58
    path_exists,
384
58
    read_link,
59
    read_link,
385
59
    recursive_move,
60
    recursive_move,
386
@@ -1448,7 +1449,7 @@
387
1448
            make_dir(self._data_dir, recursive=True)
1449
            make_dir(self._data_dir, recursive=True)
388
1449
            self.update_metadata_version()
1450
            self.update_metadata_version()
389
1450
        elif path_exists(self._version_file):
1451
        elif path_exists(self._version_file):
391
1451
            with open(self._version_file) as fh:
1452
            with open_file(self._version_file) as fh:
392
1452
                md_version = fh.read().strip()
1453
                md_version = fh.read().strip()
393
1453
            if not md_version:
1454
            if not md_version:
394
1454
                # we don't have a version of the metadata but a .version file?
1455
                # we don't have a version of the metadata but a .version file?
395
@@ -1464,7 +1465,7 @@
396
1464
        """Write the version of the metadata."""
1465
        """Write the version of the metadata."""
397
1465
        if not path_exists(os.path.dirname(self._version_file)):
1466
        if not path_exists(os.path.dirname(self._version_file)):
398
1466
            make_dir(os.path.dirname(self._version_file), recursive=True)
1467
            make_dir(os.path.dirname(self._version_file), recursive=True)
400
1467
        with open(self._version_file, 'w') as fd:
1468
        with open_file(self._version_file, 'w') as fd:
401
1468
            fd.write(VolumeManager.METADATA_VERSION)
1469
            fd.write(VolumeManager.METADATA_VERSION)
402
1469
            # make sure the data get to disk
1470
            # make sure the data get to disk
403
1470
            fd.flush()
1471
            fd.flush()
Reviewer	Date Requested	Status
Manuel de la Peña (community)		Approve on 2011-09-20
Roberto Alsina (community)	2011-09-20	Approve on 2011-09-20
Review via email: mp+76145@code.launchpad.net