equal
deleted
inserted
replaced
46 util, |
46 util, |
47 verify as verifymod, |
47 verify as verifymod, |
48 vfs as vfsmod, |
48 vfs as vfsmod, |
49 ) |
49 ) |
50 |
50 |
|
51 from .utils import ( |
|
52 stringutil, |
|
53 ) |
|
54 |
51 release = lock.release |
55 release = lock.release |
52 |
56 |
53 # shared features |
57 # shared features |
54 sharedbookmarks = 'bookmarks' |
58 sharedbookmarks = 'bookmarks' |
55 |
59 |
268 requirements += 'relshared\n' |
272 requirements += 'relshared\n' |
269 except (IOError, ValueError) as e: |
273 except (IOError, ValueError) as e: |
270 # ValueError is raised on Windows if the drive letters differ on |
274 # ValueError is raised on Windows if the drive letters differ on |
271 # each path |
275 # each path |
272 raise error.Abort(_('cannot calculate relative path'), |
276 raise error.Abort(_('cannot calculate relative path'), |
273 hint=util.forcebytestr(e)) |
277 hint=stringutil.forcebytestr(e)) |
274 else: |
278 else: |
275 requirements += 'shared\n' |
279 requirements += 'shared\n' |
276 |
280 |
277 destvfs.write('requires', requirements) |
281 destvfs.write('requires', requirements) |
278 destvfs.write('sharedpath', sharedpath) |
282 destvfs.write('sharedpath', sharedpath) |