Fix not-pinned check

[pinch] / pinch.py

diff --git a/pinch.py b/pinch.py
index d8bf75cf3747f44f9b0547b0db72d631166775da..4c2341f6f03d772525c5e6531fda657ff5458fd9 100644 (file)
--- a/pinch.py
+++ b/pinch.py
@@ -148,7 +148,7 @@ class GitSearchPath(TarrableSearchPath):
 
     def fetch(self, v: Verification, section: str,
               conf: configparser.SectionProxy) -> str:
 
     def fetch(self, v: Verification, section: str,
               conf: configparser.SectionProxy) -> str:

-        if 'git_repo' not in conf or 'release_name' not in conf:
+        if 'git_revision' not in conf or 'release_name' not in conf:

             raise Exception(
                 'Cannot update unpinned channel "%s" (Run "pin" before "update")' %
                 section)
             raise Exception(
                 'Cannot update unpinned channel "%s" (Run "pin" before "update")' %
                 section)


@@ -609,7 +609,7 @@ def read_config_files(
     return merged_config
 
 
     return merged_config
 
 

-def pin(args: argparse.Namespace) -> None:
+def pinCommand(args: argparse.Namespace) -> None:

     v = Verification()
     config = read_config(args.channels_file)
     for section in config.sections():
     v = Verification()
     config = read_config(args.channels_file)
     for section in config.sections():


@@ -624,7 +624,7 @@ def pin(args: argparse.Namespace) -> None:
         config.write(configfile)
 
 
         config.write(configfile)
 
 

-def update(args: argparse.Namespace) -> None:
+def updateCommand(args: argparse.Namespace) -> None:

     v = Verification()
     exprs: Dict[str, str] = {}
     config = read_config_files(args.channels_file)
     v = Verification()
     exprs: Dict[str, str] = {}
     config = read_config_files(args.channels_file)


@@ -666,11 +666,11 @@ def main() -> None:
     parser_pin = subparsers.add_parser('pin')
     parser_pin.add_argument('channels_file', type=str)
     parser_pin.add_argument('channels', type=str, nargs='*')
     parser_pin = subparsers.add_parser('pin')
     parser_pin.add_argument('channels_file', type=str)
     parser_pin.add_argument('channels', type=str, nargs='*')

-    parser_pin.set_defaults(func=pin)
+    parser_pin.set_defaults(func=pinCommand)

     parser_update = subparsers.add_parser('update')
     parser_update.add_argument('--dry-run', action='store_true')
     parser_update.add_argument('channels_file', type=str, nargs='+')
     parser_update = subparsers.add_parser('update')
     parser_update.add_argument('--dry-run', action='store_true')
     parser_update.add_argument('channels_file', type=str, nargs='+')

-    parser_update.set_defaults(func=update)
+    parser_update.set_defaults(func=updateCommand)

     args = parser.parse_args()
     args.func(args)
 
     args = parser.parse_args()
     args.func(args)