From c0ba8fb0195e37dd71ec2ae5f7d67cbcf3157492 Mon Sep 17 00:00:00 2001
From: Mike Khiretskiy <mh@calculate.ru>
Date: Wed, 25 Mar 2015 15:25:12 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?=
 =?UTF-8?q?=D0=B0=20layman=202.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/update/update.py           | 12 +++++++-----
 pym/update/variables/update.py |  9 ++++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pym/update/update.py b/pym/update/update.py
index a3aa592..8e0e197 100644
--- a/pym/update/update.py
+++ b/pym/update/update.py
@@ -261,13 +261,14 @@ class Update(object):
         self.addProgress()
         if clean_on_error:
             try:
-                if not self._syncRepository(repname, url, rpath, revision, branch,
-                                     cb_progress=self.setProgress):
-                    return "skip"
                 layman = Layman(dv.Get('cl_update_layman_installed'),
-                                dv.Get('cl_update_layman_make'))
+                                dv.Get('cl_update_layman_make'),
+                                dv.Get('cl_update_layman_conf'))
                 if repname != "portage":
                     layman.add(repname, url, rpath)
+                if not self._syncRepository(repname, url, rpath, revision, branch,
+                                     cb_progress=self.setProgress):
+                    return "skip"
                 return True
             except GitError as e:
                 if e.addon:
@@ -295,7 +296,8 @@ class Update(object):
                 return "skip"
 
         layman = Layman(dv.Get('cl_update_layman_installed'),
-                        dv.Get('cl_update_layman_make'))
+                        dv.Get('cl_update_layman_make'),
+                        dv.Get('cl_update_layman_conf'))
         if repname != "portage":
             layman.add(repname, url, rpath)
         return True
diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py
index 2713ac6..be3c7f5 100644
--- a/pym/update/variables/update.py
+++ b/pym/update/variables/update.py
@@ -381,7 +381,8 @@ class VariableClUpdateOtherRepData(ReadonlyTableVariable):
     def generator(self):
         repNames = self.Get('cl_update_rep_name')
         layman = Layman(self.Get('cl_update_layman_installed'),
-                        self.Get('cl_update_layman_make'))
+                        self.Get('cl_update_layman_make'),
+                        self.Get('cl_update_layman_conf'))
         layman_overlays = layman.get_installed()
         for rpath in self.Get('cl_portdir_overlay'):
             repo_file = path.join(rpath, "profiles/repo_name")
@@ -422,6 +423,12 @@ class VariableClUpdateLaymanMake(Variable):
     # TODO: извлечь из layman.cfg
     value = "/var/lib/layman/make.conf"
 
+class VariableClUpdateLaymanConf(Variable):
+    """
+    Путь до конфигурационного файла репозиториев для layman
+    """
+    value = "/etc/portage/repos.conf/layman.conf"
+
 class VariableClUpdatePretendSet(Variable):
     """
     Запустить предварительную проверку на обновления