A few minor tweaks.

9 years ago · faa623eb93
parent 29fa1dd522
commit faa623eb93
2 changed files with 6 additions and 3 deletions
--- a/wrap/meson.build
+++ b/wrap/meson.build
@ -6,3 +6,5 @@ exe = executable('gitprog', 'prog.c',
 include_directories : sp.get_variable('subproj_inc'),
 link_with : sp.get_variable('subproj_lib'),
 )
+
+test('maintest', exe)
--- a/wrap.py
+++ b/wrap.py
@ -69,9 +69,10 @@ class Resolver:
                if revno.lower() == 'head':
                    subprocess.check_call(['git', 'pull'], cwd=checkoutdir)
                else:
-                    subprocess.check_call(['git', 'fetch'], cwd=checkoutdir)
-                    subprocess.check_call(['git', 'checkout', revno],
-                                          cwd=checkoutdir)
+                    if subprocess.call(['git', 'checkout', revno], cwd=checkoutdir) != 0:
+                        subprocess.check_call(['git', 'fetch'], cwd=checkoutdir)
+                        subprocess.check_call(['git', 'checkout', revno],
+                                              cwd=checkoutdir)
            else:
                subprocess.check_call(['git', 'clone', p.get('url'), p.get('directory')],
                                      cwd=self.subdir_root)