Philipp Hörist pushed to branch master at gajim / gajim
Commits:
02b5bbc5 by lovetox at 2022-05-08T14:31:03+02:00
fix: Plugins: Change manifest.json name
The current name conflicts with Flatpak
- - - - -
1 changed file:
- gajim/plugins/pluginmanager.py
Changes:
=====================================
gajim/plugins/pluginmanager.py
=====================================
@@ -96,7 +96,7 @@ def get_remote_url(self, repository_url: str) -> str:
@classmethod
def from_path(cls, path: Path) -> PluginManifest:
- manifest_path = path / 'manifest.json'
+ manifest_path = path / 'plugin-manifest.json'
if not manifest_path.exists():
manifest_path = path / 'manifest.ini'
if not manifest_path.exists():
@@ -108,7 +108,7 @@ def from_path(cls, path: Path) -> PluginManifest:
if manifest_path.name == 'manifest.ini':
return cls.from_manifest_ini(manifest_path)
- if manifest_path.name == 'manifest.json':
+ if manifest_path.name == 'plugin-manifest.json':
with manifest_path.open() as f:
try:
manifest = json.load(f)
@@ -725,7 +725,7 @@ def install_from_zip(self,
raise PluginsystemError(_('Archive is malformed'))
if filename.endswith('/') and filename.find('/', 0, -1) < 0:
dirs.append(filename.strip('/'))
- if 'manifest.json' in filename.split('/')[1]:
+ if 'plugin-manifest.json' in filename.split('/')[1]:
manifest = True
if not manifest:
return None
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/02b5bbc50bfd90271b62ddbca642ed087d29a8e8
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/02b5bbc50bfd90271b62ddbca642ed087d29a8e8
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
