diff options
author | Luis Martinez de Bartolome Izquierdo <lasote@gmail.com> | 2021-09-30 18:28:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-30 18:28:30 +0200 |
commit | 81fbfe9831276fbf43193397af9739465ccc4e78 (patch) | |
tree | 58e69cee3bf867cbbdd5d47b69eb381b68977cb4 | |
parent | 0b73bda72bff3b4d20c0c1ad3a01f99963421fb8 (diff) |
Added migration (#9697)
-rw-r--r-- | conans/client/migrations.py | 15 | ||||
-rw-r--r-- | conans/client/rest/cacert.py | 31 |
2 files changed, 45 insertions, 1 deletions
diff --git a/conans/client/migrations.py b/conans/client/migrations.py index cc33e9f5..8ab5a79b 100644 --- a/conans/client/migrations.py +++ b/conans/client/migrations.py @@ -13,7 +13,8 @@ from conans.model.manifest import FileTreeManifest from conans.model.package_metadata import PackageMetadata from conans.model.ref import ConanFileReference, PackageReference from conans.model.version import Version -from conans.paths import CONANFILE, EXPORT_SOURCES_TGZ_NAME, PACKAGE_TGZ_NAME, EXPORT_TGZ_NAME +from conans.paths import CONANFILE, EXPORT_SOURCES_TGZ_NAME, PACKAGE_TGZ_NAME, EXPORT_TGZ_NAME, \ + CACERT_FILE from conans.paths import PACKAGE_METADATA from conans.paths.package_layouts.package_cache_layout import PackageCacheLayout from conans.util.files import list_folder_subdirs, load, save @@ -97,6 +98,9 @@ class ClientMigrator(Migrator): if old_version < Version("1.31.0"): migrate_tgz_location(cache, self.out) + if old_version < Version("1.40.3"): + remove_buggy_cacert(cache, self.out) + def _get_refs(cache): folders = list_folder_subdirs(cache.store, 4) @@ -109,6 +113,15 @@ def _get_prefs(layout): return [PackageReference(layout.ref, s) for s in folders] +def remove_buggy_cacert(cache, out): + """https://github.com/conan-io/conan/pull/9696 + Needed migration because otherwise the cacert is kept in the cache even upgrading conan""" + cacert_path = os.path.join(cache.cache_folder, CACERT_FILE) + if os.path.exists(cacert_path): + out.info("Removing the 'cacert.pem' file...") + os.unlink(cacert_path) + + def migrate_tgz_location(cache, out): """ In Conan 1.31, the temporary .tgz are no longer stored in the content folders. In case they are found there, they can be removed, and the next time they are needed (upload), they diff --git a/conans/client/rest/cacert.py b/conans/client/rest/cacert.py index cbde6595..5b80ff00 100644 --- a/conans/client/rest/cacert.py +++ b/conans/client/rest/cacert.py @@ -5701,4 +5701,35 @@ j4rBYKEMrltDR5FL1ZoXX/nUh8HCjLfn4g8wGTeGrODcQgPmlKidrv0PJFGUzpII lBlGGSW4gNfL1IYoakRwJiNiqZ+Gb7+6kHDSVneFeO/qJakXzlByjAA6quPbYzSf +AZxAeKCINT+b72x -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4 +WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu +ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY +MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc +h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+ +0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U +A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW +T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH +B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC +B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv +KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn +OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn +jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw +qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI +rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV +HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq +hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL +ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ +3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK +NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5 +ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur +TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC +jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc +oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq +4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA +mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d +emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc= +-----END CERTIFICATE----- """ |