Skip to content

Commit

Permalink
fixed migration settings.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
memsharded committed Nov 21, 2017
1 parent 1315c41 commit d76ca9a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 17 deletions.
2 changes: 1 addition & 1 deletion conans/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
COMPLEX_SEARCH_CAPABILITY = "complex_search"
SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, ]

__version__ = '0.29.0'
__version__ = '0.29.1'
18 changes: 2 additions & 16 deletions conans/client/migrations.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
import shutil

from conans.client.client_cache import CONAN_CONF, PROFILES_FOLDER
from conans.errors import ConanException
from conans.migrations import Migrator, CONAN_VERSION
from conans.migrations import Migrator
from conans.paths import EXPORT_SOURCES_DIR_OLD
from conans.util.files import load, save
from conans.model.version import Version
Expand Down Expand Up @@ -41,8 +40,7 @@ def _make_migrations(self, old_version):
# VERSION 0.1
if old_version is None:
return

if old_version < Version("0.25"):
if old_version < Version("0.29"):
old_settings = """
os:
Windows:
Expand Down Expand Up @@ -79,18 +77,6 @@ def _make_migrations(self, old_version):
"""
self._update_settings_yml(old_settings)

if old_version < Version("0.20"):
conf_path = os.path.join(self.client_cache.conan_folder, CONAN_CONF)
if conf_path:
backup_path = conf_path + ".backup"
save(backup_path, load(conf_path))
os.unlink(conf_path)
os.unlink(os.path.join(self.client_cache.conan_folder, CONAN_VERSION))
self.out.warn("*" * 40)
self.out.warn("Migration: Your Conan version was too old.")
self.out.warn("Your old conan.conf file has been backup'd to: %s" % backup_path)
self.out.warn("*" * 40)

if old_version < Version("0.25"):
from conans.paths import DEFAULT_PROFILE_NAME
default_profile_path = os.path.join(self.client_cache.conan_folder, PROFILES_FOLDER,
Expand Down

0 comments on commit d76ca9a

Please sign in to comment.