Do not fail keychain add-certificate on duplicate certs (#57)

CHANGELOG.md

@@ -1,3 +1,10 @@
+Version 0.3.2
+-------------
+
+**Improvements**
+
+- Bugfix: Do not fail `keychain add-certificate` action in case the added certificate already exists in keychain.
+
 Version 0.3.1
 -------------
 

src/codemagic/__version__.py

@@ -1,5 +1,5 @@
 __title__ = "codemagic-cli-tools"
 __description__ = "CLI tools used in Codemagic builds"
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 __url__ = 'https://github.com/codemagic-ci-cd/cli-tools'
 __licence__ = 'GNU General Public License v3.0'

src/codemagic/tools/keychain.py

@@ -280,8 +280,12 @@ def _add_certificate(self,
             '-T', shutil.which('codesign'),
             '-P', certificate_password.value,
         ], obfuscate_patterns=obfuscate_patterns)
+
         if process.returncode != 0:
-            raise KeychainError(f'Unable to add certificate {certificate_path} to keychain {self.path}', process)
+            if 'The specified item already exists in the keychain' in process.stderr:
+                pass  # It is fine that the certificate is already in keychain
+            else:
+                raise KeychainError(f'Unable to add certificate {certificate_path} to keychain {self.path}', process)
 
     def _find_certificates(self):
         process = self.execute(('security', 'find-certificate', '-a', '-p', self.path), show_output=False)