CalvinBackup/mvt
1
0 Fork 0
mirror of https://github.com/mvt-project/mvt.git synced 2026-09-30 21:19:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dkg-clearer-error-reporting'

Browse Source
This commit is contained in:
Nex committed 2021-08-05 08:56:52 +02:00
2 parents 76e6138d77 2302c9fb1c
commit ef139effdb
1 file changed
+7 -2
Download Patch File Download Diff File Expand all files Collapse all files
mvt/ios/decrypt.py
+7 -2
View File
@@ -78,8 +78,13 @@ class DecryptBackup:
cleartextpassword=password, cleartextpassword=password,
backuproot=os.path.dirname(self.backup_path)) backuproot=os.path.dirname(self.backup_path))
except Exception as e: except Exception as e:
log.exception(e) if isinstance(e, KeyError) and len(e.args) > 0 and e.args[0] == b"KEY":
log.critical("Failed to decrypt backup. Did you provide the correct password?") log.critical("Failed to decrypt backup. Password is probably wrong.")
elif isinstance(e, FileNotFoundError) and os.path.basename(e.filename) == "Manifest.plist":
log.critical(f"Failed to find a valid backup at {self.backup_path}. Did you point to the right backup path?")
else:
log.exception(e)
log.critical("Failed to decrypt backup. Did you provide the correct password? Did you point to the right backup path?")
def decrypt_with_key_file(self, key_file): def decrypt_with_key_file(self, key_file):
"""Decrypts an encrypted iOS backup using a key file. """Decrypts an encrypted iOS backup using a key file.