Удалена отладочная информация

pym/calculate/lib/datavars.py

@@ -805,6 +805,19 @@ class SimpleDataVars(object):
                 raise DataVarsError(_("Failed to get value %s")%varname)
         return self.cache[varname]
 
+    def GetBool(self,varname):
+        return Variable.isTrue(self.Get(varname))
+
+    def GetInteger(self,varname):
+        """
+        Получить целочисленное значение
+        """
+        try:
+            return int(self.Get(varname))
+        except ValueError:
+            return 0
+
+
     def getInfo(self,varname):
         return self.allVars.get(varname, None)
 
@@ -1089,8 +1102,10 @@ class DataVars(SimpleDataVars):
         return section
 
     def raiseVariableNotFound(self,varname,*args,**kwargs):
-        import traceback
-        traceback.print_stack()
+        # TODO: DEBUG raise variable not found
+        # import traceback
+        # traceback.print_stack()
+        # print "Variable not found:", varname
         raise DataVarsError(_("Variable %s not found")%varname)
 
     def raiseModuleError(self,module,error,*args,**kwargs):
@@ -1111,7 +1126,7 @@ class DataVars(SimpleDataVars):
             if varname in self.allVars.keys():
                 section,varObj = self.allVars[varname]
                 newVar = varObj(parent=self,section=section)
-                if hasattr(newVar,"refresh"):
+                if hasattr(newVar, "refresh"):
                     self.refresh.append(newVar)
                 self.loadVariables[varname] = newVar
             else:
@@ -1237,18 +1252,6 @@ class DataVars(SimpleDataVars):
             DataVars.l.release()
         return var
 
-    def GetBool(self,varname):
-        return Variable.isTrue(self.Get(varname))
-
-    def GetInteger(self,varname):
-        """
-        Получить целочисленное значение
-        """
-        try:
-            return int(self.Get(varname))
-        except ValueError:
-            return 0
-
     def isFromIni(self,varname):
         """
         Check what value get from ini file

pym/calculate/lib/utils/files.py

@@ -1105,7 +1105,8 @@ def copyWithPath(fn,dest,prefix=None):
             os.makedirs(destDir)
         copy2(fn, destFile)
     except Exception as e:
-        print str(e)
+        # TODO: DEBUG
+        # print str(e)
         raise FilesError(
             _("Failed to copy '%(src)s' to '%(dst)s'") %
             {'src': fn,

pym/calculate/lib/utils/git.py

@@ -188,6 +188,10 @@ class Git:
         :param rpath: путь до репозитория
         :return: True репозиторий переключается по тэгам
         """
+        git_path = self._gitDir(rpath)
+        data = self._getFetchHeadInfo(git_path)
+        if "type" in data and data['type'] == self.Reference.Tag:
+            return True
         return False
 
     class Reference:
@@ -230,6 +234,7 @@ class Git:
         # получить последние коммиты из удаленного репозитория
         try:
             if (self.reference_type(rpath, reference) == Git.Reference.Tag and
+                self.isTagRepository(rpath) and
                 self.getCurrentCommit(rpath) == self.getCommit(rpath,
                                                                reference)):
                 return False
@@ -240,6 +245,7 @@ class Git:
                 _("Reference {mark} not found in repository {url}"
                   ).format(mark=reference, url=url))
         if command("reset", "--hard", "FETCH_HEAD", part=4, startpart=3):
+            command("clean", "-df")
             if self.saveFetchHead(git_dir) == self.Reference.Branch:
                 command("symbolic-ref", "HEAD", "refs/heads/%s" % reference)
             return True
@@ -516,6 +522,18 @@ class Git:
         """
         return self.getStatusInfo(rpath)['branch']
 
+    def getTags(self, rpath):
+        """
+        Получить список тэгов, отсортированных по версии
+        """
+        git_dir = self._gitDir(rpath)
+        git_tag = process(self._git, "--git-dir", git_dir, "--work-tree",
+                          rpath,
+                          "tag", "--sort=version:refname", stderr=STDOUT)
+        if git_tag.success():
+            return [x.strip() for x in git_tag if x.strip()]
+        return []
+
     def checkoutBranch(self, rpath, branch):
         """
         Сменить ветку

pym/calculate/lib/utils/portage.py

@@ -1085,10 +1085,11 @@ class EbuildInfo(object):
 
     def __ne__(self, other):
         res = any(other[k] != self[k] for k in self.support_keys)
-        if res:
-            for k in self.support_keys:
-                if other[k] != self[k]:
-                    print k,":", other[k], "!=", self[k]
+        # TODO: DEBUG
+        #if res:
+        #    for k in self.support_keys:
+        #        if other[k] != self[k]:
+        #            print k,":", other[k], "!=", self[k]
         return res
 
 

pym/calculate/lib/variables/linux.py

@@ -273,7 +273,7 @@ class VariableClProfileName(ReadonlyVariable):
         if not o:
             return make_profile
         distro = path.basename(distro)
-        return "%s::%s" % (distro, name)
+        return "%s:%s" % (distro, name)
 
 
 class LinuxDataVars(SimpleDataVars):