Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-11 07:18:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #548 from efiop/master

Browse Source 
dvc: don't change mode of files
This commit is contained in:
Ruslan Kuprieiev
2018-03-14 12:56:26 +02:00
committed by GitHub
parent 7019b796ba 2fe6091ffb
commit 7355c15f61
8 changed files with 14 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dvc/output.py
+5 -10
View File
@@ -160,7 +160,7 @@ class Output(Dependency):
md5 = self.project.state.update(cache)
if md5 != self.project.cache.path_to_md5(cache):
self.project.logger.debug('Corrupted cache file {}'.format(cache))
self.project._remove_cache_file(cache)
os.unlink(cache)
return True
return False
@@ -169,7 +169,6 @@ class Output(Dependency):
if os.path.isfile(path) and \
os.path.isfile(cache) and \
System.samefile(path, cache) and \
os.stat(cache).st_mode & stat.S_IREAD and \
not self._changed_cache(cache):
return False
@@ -222,7 +221,6 @@ class Output(Dependency):
os.makedirs(dname)
System.hardlink(src, link)
os.chmod(src, stat.S_IREAD)
@staticmethod
def load_dir_cache(path):
@@ -321,7 +319,7 @@ class Output(Dependency):
cache = self.project.cache.get(md5)
if os.path.exists(cache):
self._remove(path, None)
self._remove(path)
self.hardlink(cache, path)
else:
self.hardlink(path, cache)
@@ -360,19 +358,16 @@ class Output(Dependency):
else:
self.hardlink(self.path, self.cache)
def _remove(self, path, cache):
def _remove(self, path):
self.project.logger.debug(u'Removing \'{}\''.format(path))
os.chmod(path, stat.S_IWUSR)
os.unlink(path)
if cache is not None and os.path.exists(cache):
os.chmod(cache, stat.S_IREAD)
def remove(self):
if not os.path.exists(self.path):
return
if os.path.isfile(self.path):
self._remove(self.path, self.cache)
self._remove(self.path)
return
caches = self.dir_cache()
@@ -384,5 +379,5 @@ class Output(Dependency):
path = os.path.join(root, f)
relpath = os.path.relpath(path, self.path)
cache = caches.get(relpath, None)
self._remove(path, cache)
self._remove(path)
os.rmdir(self.path)
dvc/project.py
+1 -7
View File
@@ -159,9 +159,7 @@ class Project(object):
continue
Logger.info(u'Remove \'{}\''.format(file))
os.chmod(file, stat.S_IWRITE)
os.remove(file)
os.chmod(cache[inode], stat.S_IREAD)
dir = os.path.dirname(file)
if len(dir) != 0 and not os.listdir(dir):
@@ -192,16 +190,12 @@ class Project(object):
return list(cache_set)
def _remove_cache_file(self, cache):
os.chmod(cache, stat.S_IWRITE | stat.S_IREAD)
os.unlink(cache)
def gc(self):
clist = self._used_cache()
for cache in self.cache.all():
if cache in clist:
continue
self._remove_cache_file(cache)
os.unlink(cache)
self.logger.info(u'\'{}\' was removed'.format(self.to_dvc_path(cache)))
def push(self, target=None, jobs=1):
tests/test_add.py
-1
View File
@@ -75,7 +75,6 @@ class TestAddDirWithExistingCache(TestDvc):
class TestAddModifiedDir(TestDvc):
def test(self):
self.dvc.add(self.DATA_DIR)
os.chmod(self.DATA, stat.S_IWRITE)
os.unlink(self.DATA)
self.dvc.add(self.DATA_DIR)
tests/test_checkout.py
+6 -3
View File
@@ -13,11 +13,16 @@ class TestCheckout(TestRepro):
def setUp(self):
super(TestCheckout, self).setUp()
self.dvc.add(self.DATA_DIR)
self.orig = 'orig'
shutil.copy(self.FOO, self.orig)
os.chmod(self.FOO, stat.S_IWRITE)
os.unlink(self.FOO)
self.orig_dir = 'orig_dir'
shutil.copytree(self.DATA_DIR, self.orig_dir)
shutil.rmtree(self.DATA_DIR)
def test(self):
self.dvc.checkout()
self._test_checkout()
@@ -33,10 +38,8 @@ class TestCheckoutCorruptedCacheFile(TestRepro):
time.sleep(1)
os.chmod(cache, stat.S_IWRITE)
with open(cache, 'a') as fd:
fd.write('1')
os.chmod(cache, stat.S_IREAD)
self.dvc.checkout()
tests/test_data_cloud.py
+2 -10
View File
@@ -63,18 +63,13 @@ class TestDataCloudBase(TestDvc):
self.assertEqual(status_dir, STATUS_OK)
# Modify and check status
os.chmod(cache, stat.S_IWRITE)
with open(cache, 'a') as fd:
fd.write('addon')
os.chmod(cache, 0o777)
status = self.cloud.status(cache)
self.assertEqual(status, STATUS_MODIFIED)
# Remove and check status
for root, dirs, files in os.walk(self.dvc.cache.cache_dir):
for f in files:
path = os.path.join(root, f)
self.dvc._remove_cache_file(path)
shutil.rmtree(self.dvc.cache.cache_dir)
status = self.cloud.status(cache)
self.assertEqual(status, STATUS_DELETED)
@@ -210,10 +205,7 @@ class TestDataCloudLocalCli(TestDvc):
self.main(['status'])
for root, dirs, files in os.walk(self.dvc.cache.cache_dir):
for f in files:
path = os.path.join(root, f)
self.dvc._remove_cache_file(path)
shutil.rmtree(self.dvc.cache.cache_dir)
self.main(['status'])
tests/test_fsck.py
-4
View File
@@ -74,7 +74,6 @@ class TestFsck(TestDvc):
foo_cache_file = os.path.join(self.dvc.cache.cache_dir, md5[0:2], md5[2:])
self.assertTrue(os.path.exists(foo_cache_file))
os.chmod(foo_cache_file, 0o777)
os.remove(foo_cache_file)
self.assertFalse(os.path.exists(foo_cache_file))
@@ -87,7 +86,6 @@ class TestFsck(TestDvc):
self.dvc.add(self.FOO)
self.dvc.add(self.BAR)
os.chmod(self.FOO, 0o777)
os.remove(self.FOO)
with open(self.FOO, 'w') as fd:
fd.write('randome stuff s9dfj')
@@ -101,7 +99,6 @@ class TestFsck(TestDvc):
self.dvc.add(self.FOO)
self.dvc.add(self.BAR)
os.chmod(self.FOO, 0o777)
os.remove(self.FOO)
with open(self.FOO, 'w') as fd:
fd.write('randome stuff 39re2fwecsb nj')
@@ -115,7 +112,6 @@ class TestFsck(TestDvc):
self.dvc.add(self.FOO)
self.dvc.add(self.BAR)
os.chmod(self.FOO, 0o777)
os.remove(self.FOO)
no_data_file = 'baz'
tests/test_repro.py
-2
View File
@@ -51,7 +51,6 @@ class TestReproChangedData(TestRepro):
self.assertEqual(len(stages), 2)
def swap_foo_with_bar(self):
os.chmod(self.FOO, stat.S_IWRITE)
os.unlink(self.FOO)
shutil.copyfile(self.BAR, self.FOO)
@@ -87,7 +86,6 @@ class TestReproPhony(TestReproChangedData):
class TestNonExistingOutput(TestRepro):
def test(self):
os.chmod(self.FOO, stat.S_IWRITE)
os.unlink(self.FOO)
with self.assertRaises(ReproductionError) as cx:
tests/test_state.py
-1
View File
@@ -28,7 +28,6 @@ class TestState(TestDvc):
# files that were modified within that delta.
time.sleep(1)
os.chmod(path, stat.S_IWRITE)
os.unlink(path)
with open(path, 'w+') as fd:
fd.write('1')