Use always parse_info_file in get_info

Currently, when using parameter gitrev, parsing
of rdoinfo file is done in rdopkg instead of using
parse_info_file function provided by rdoinfo.

In https://review.rdoproject.org/r/#/c/6105/ rdoinfo
is adding a second file for dependencies so current yaml
load in rdopkg is not enough for proper parsing.

This patch changes rdopkg to use parse_info_file from
rdoinfo always, even when used with gitrev. In this case
rdoinfo will checkout the desired commit and after parsing
it checkout again to the original position.

Note that we need to force rdoinfo module reload after each
checkout as the content may change.

Change-Id: If0db2426bb9ecf8612c3f0d58384e748c332c04b

Author: amoralej

rdopkg/actionmods/rdoinfo.py

@@ -1,6 +1,7 @@
 import collections
 import imp
 import re
+import sys
 import yaml
 
 from rdopkg import exception
@@ -91,19 +92,26 @@ def __init__(self, *args, **kwargs):
         self._info = None
 
     def ensure_rdoinfo(self):
-        if self.rdoinfo:
-            return
+        # when running get_info with gitrev, we are modifying rdoinfo module
+        # while runing rdopkg. This seems to be problematic if we are using
+        # the compiled .pyc so i'm forcing to load rdoinfo module from .py
+        sys.dont_write_bytecode = True
         file, path, desc = imp.find_module('rdoinfo', [self.repo_path])
         self.rdoinfo = imp.load_module('rdoinfo', file, path, desc)
+        sys.dont_write_bytecode = False
 
     def get_info(self, gitrev=None):
-        self.ensure_rdoinfo()
         with self.repo_dir():
             if gitrev:
-                infofile = git.get_file_content(gitrev, self.info_file)
-                info = yaml.load(infofile)
-                self.rdoinfo.parse_info(info, apply_tag=self.apply_tag)
+                commit1 = git.current_commit()
+                git('checkout', gitrev, log_cmd=False)
+                self.ensure_rdoinfo()
+                info = self.rdoinfo.parse_info_file(
+                    self.info_file, apply_tag=self.apply_tag)
+                git('checkout', commit1, log_cmd=False)
+                self.ensure_rdoinfo()
             else:
+                self.ensure_rdoinfo()
                 info = self.rdoinfo.parse_info_file(
                     self.info_file, apply_tag=self.apply_tag)
         return info

rdopkg/utils/cmd.py

@@ -149,6 +149,10 @@ def current_branch(self):
         branch = self('rev-parse', '--abbrev-ref', 'HEAD', log_cmd=False)
         return branch
 
+    def current_commit(self):
+        commit = self('rev-parse', 'HEAD', log_cmd=False)
+        return commit
+
     def ref_exists(self, ref):
         o = self('show-ref', '--verify', '--quiet', ref,
                  fatal=False, log_cmd=False, log_fail=False)