Parcourir la source

g.extension: fix parse PGM variable from Makefile (#1181)

Tomas Zigo il y a 4 ans
Parent
commit
38247f691d
1 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 3 3
      scripts/g.extension/g.extension.py

+ 3 - 3
scripts/g.extension/g.extension.py

@@ -1535,15 +1535,15 @@ def install_extension_std_platforms(name, source, url, branch):
                 # get the module name: PGM = <module name>
                 # get the module name: PGM = <module name>
                 with open(os.path.join(r, 'Makefile')) as fp:
                 with open(os.path.join(r, 'Makefile')) as fp:
                     for line in fp.readlines():
                     for line in fp.readlines():
-                        if "PGM" in line:
+                        if re.match(r'PGM.*.=|PGM=', line):
                             try:
                             try:
                                 modulename = line.split('=')[1].strip()
                                 modulename = line.split('=')[1].strip()
                                 if modulename:
                                 if modulename:
                                     module_list.append(modulename)
                                     module_list.append(modulename)
                                 else:
                                 else:
-                                    grass.error(pgm_not_found_message)
+                                    grass.fatal(pgm_not_found_message)
                             except IndexError:
                             except IndexError:
-                                grass.error(pgm_not_found_message)
+                                grass.fatal(pgm_not_found_message)
 
 
     # change shebang from python to python3
     # change shebang from python to python3
     pyfiles = []
     pyfiles = []