From dd5d5e903b58f3b7963a24b47219031564d9f86c Mon Sep 17 00:00:00 2001
From: Yves Noirjean <yves.noirjean@id.ethz.ch>
Date: Tue, 10 Apr 2018 16:32:28 +0200
Subject: [PATCH] obis: deleting untracked properties.json file when restoring
repository state
---
src/python/OBis/obis/dm/data_mgmt.py | 1 +
src/python/OBis/obis/dm/git.py | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/src/python/OBis/obis/dm/data_mgmt.py b/src/python/OBis/obis/dm/data_mgmt.py
index 6899cbf6718..a156969f847 100644
--- a/src/python/OBis/obis/dm/data_mgmt.py
+++ b/src/python/OBis/obis/dm/data_mgmt.py
@@ -311,6 +311,7 @@ class GitDataMgmt(AbstractDataMgmt):
self.git_wrapper.git_reset_to(self.previous_git_commit_hash)
properties_path = self.config_resolver.local_public_properties_path()
self.git_wrapper.git_checkout(properties_path)
+ self.git_wrapper.git_delete_if_untracked('.obis/properties.json')
def clone(self, data_set_id, ssh_user, content_copy_index):
try:
diff --git a/src/python/OBis/obis/dm/git.py b/src/python/OBis/obis/dm/git.py
index cdfea134597..656f17af1ef 100644
--- a/src/python/OBis/obis/dm/git.py
+++ b/src/python/OBis/obis/dm/git.py
@@ -86,6 +86,10 @@ class GitWrapper(object):
gitignore.write(path)
gitignore.write("\n")
+ def git_delete_if_untracked(self, file):
+ result = run_shell([self.git_path, 'ls-files', '--error-unmatch', file])
+ if file in result.output:
+ run_shell(['rm', file])
class GitRepoFileInfo(object):
"""Class that gathers checksums and file lengths for all files in the repo."""
--
GitLab