Skip to content

Commit

Permalink
config: don't switch between trees (iterative#4271)
Browse files Browse the repository at this point in the history
No longer needed, since we have `use_dvcignore` flag.
  • Loading branch information
efiop authored Jul 23, 2020
1 parent 5ed8320 commit 0c99fd3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
10 changes: 4 additions & 6 deletions dvc/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,25 +314,23 @@ def load(self, validate=True):

def _load_config(self, level):
filename = self.files[level]
tree = self.tree if level == "repo" else self.wtree

if tree.exists(filename, use_dvcignore=False):
with tree.open(filename) as fobj:
if self.tree.exists(filename, use_dvcignore=False):
with self.tree.open(filename) as fobj:
conf_obj = configobj.ConfigObj(fobj)
else:
conf_obj = configobj.ConfigObj()
return _parse_remotes(_lower_keys(conf_obj.dict()))

def _save_config(self, level, conf_dict):
filename = self.files[level]
tree = self.tree if level == "repo" else self.wtree

logger.debug(f"Writing '{filename}'.")

tree.makedirs(os.path.dirname(filename))
self.tree.makedirs(os.path.dirname(filename))

config = configobj.ConfigObj(_pack_remotes(conf_dict))
with tree.open(filename, "wb") as fobj:
with self.tree.open(filename, "wb") as fobj:
config.write(fobj)
config.filename = filename

Expand Down
1 change: 1 addition & 0 deletions dvc/utils/build.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PKG = "deb"

0 comments on commit 0c99fd3

Please sign in to comment.