summary refs log tree commit diff
diff options
context:
space:
mode:
authorBruno BELANYI <bruno@belanyi.fr>2022-02-23 19:12:39 +0100
committerBruno BELANYI <bruno@belanyi.fr>2022-02-25 11:54:07 +0100
commit75e1bb15fa4d877c7b22e1e629a5d6f5df24a54a (patch)
tree962b15e0addab52a3ccd71cf46d2a50c9dc0f60e
parent63f86edf84ca3154c0e8d31da447d5debe3de5f4 (diff)
downloadnixpkgs-75e1bb15fa4d877c7b22e1e629a5d6f5df24a54a.tar
nixpkgs-75e1bb15fa4d877c7b22e1e629a5d6f5df24a54a.tar.gz
nixpkgs-75e1bb15fa4d877c7b22e1e629a5d6f5df24a54a.tar.bz2
nixpkgs-75e1bb15fa4d877c7b22e1e629a5d6f5df24a54a.tar.lz
nixpkgs-75e1bb15fa4d877c7b22e1e629a5d6f5df24a54a.tar.xz
nixpkgs-75e1bb15fa4d877c7b22e1e629a5d6f5df24a54a.tar.zst
nixpkgs-75e1bb15fa4d877c7b22e1e629a5d6f5df24a54a.zip
vim/update.py: make '--add' option work
-rw-r--r--maintainers/scripts/pluginupdate.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py
index 877e6644032..017e3ac758a 100644
--- a/maintainers/scripts/pluginupdate.py
+++ b/maintainers/scripts/pluginupdate.py
@@ -454,8 +454,8 @@ def prefetch_plugin(
     )
 
 
-def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin:
-    plugin, _ = prefetch_plugin(parse_plugin_line(plugin_line))
+def fetch_plugin_from_pluginline(config: FetchConfig, plugin_line: str) -> Plugin:
+    plugin, _ = prefetch_plugin(parse_plugin_line(config, plugin_line))
     return plugin
 
 
@@ -586,6 +586,7 @@ def prefetch(
 
 
 def rewrite_input(
+    config: FetchConfig,
     input_file: Path,
     deprecated: Path,
     redirects: Dict[str, str] = None,
@@ -603,8 +604,8 @@ def rewrite_input(
         with open(deprecated, "r") as f:
             deprecations = json.load(f)
         for old, new in redirects.items():
-            old_plugin = fetch_plugin_from_pluginline(old)
-            new_plugin = fetch_plugin_from_pluginline(new)
+            old_plugin = fetch_plugin_from_pluginline(config, old)
+            new_plugin = fetch_plugin_from_pluginline(config, new)
             if old_plugin.normalized_name != new_plugin.normalized_name:
                 deprecations[old_plugin.normalized_name] = {
                     "new": new_plugin.normalized_name,
@@ -640,7 +641,7 @@ def update_plugins(editor: Editor, args):
     update = editor.get_update(args.input_file, args.outfile, fetch_config)
 
     redirects = update()
-    editor.rewrite_input(args.input_file, editor.deprecated, redirects)
+    editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, redirects)
 
     autocommit = not args.no_commit
 
@@ -659,9 +660,9 @@ def update_plugins(editor: Editor, args):
             )
 
     for plugin_line in args.add_plugins:
-        editor.rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",))
+        editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=(plugin_line + "\n",))
         update()
-        plugin = fetch_plugin_from_pluginline(plugin_line)
+        plugin = fetch_plugin_from_pluginline(fetch_config, plugin_line)
         if autocommit:
             commit(
                 nixpkgs_repo,