| 1 |
commit: 6f4d6dc0552b1bad10f8953de786cf0e78d975ee |
| 2 |
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 30 22:08:12 2016 +0000 |
| 4 |
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 30 22:18:41 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/layman.git/commit/?id=6f4d6dc0 |
| 7 |
|
| 8 |
Repairs layman-updater rebuild functionality |
| 9 |
|
| 10 |
reposconf.py: Adds rebuild __init__ parameter to fix rebuild |
| 11 |
functionality |
| 12 |
updater.py: Sets rebuild parameter for repos.conf ConfigHandler class |
| 13 |
|
| 14 |
layman/config_modules/reposconf/reposconf.py | 9 +++++---- |
| 15 |
layman/updater.py | 2 +- |
| 16 |
2 files changed, 6 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/layman/config_modules/reposconf/reposconf.py b/layman/config_modules/reposconf/reposconf.py |
| 19 |
index 1f0fd04..79991c9 100644 |
| 20 |
--- a/layman/config_modules/reposconf/reposconf.py |
| 21 |
+++ b/layman/config_modules/reposconf/reposconf.py |
| 22 |
@@ -53,7 +53,7 @@ def check_conf_path(conf_path): |
| 23 |
|
| 24 |
class ConfigHandler: |
| 25 |
|
| 26 |
- def __init__(self, config, overlays): |
| 27 |
+ def __init__(self, config, overlays, rebuild=False): |
| 28 |
|
| 29 |
self.config = config |
| 30 |
self.output = config['output'] |
| 31 |
@@ -61,7 +61,7 @@ class ConfigHandler: |
| 32 |
self.path = check_conf_path(config['repos_conf']) |
| 33 |
self.storage = config['storage'] |
| 34 |
self.repo_config = None |
| 35 |
- self.rebuild = False |
| 36 |
+ self.rebuild = rebuild |
| 37 |
|
| 38 |
self.read() |
| 39 |
|
| 40 |
@@ -193,14 +193,15 @@ class ConfigHandler: |
| 41 |
if self.rebuild: |
| 42 |
# start over with a fresh instance |
| 43 |
self.repo_conf = ConfigParser.ConfigParser() |
| 44 |
- if not self.repo_conf.sections(): |
| 45 |
+ for i in sorted(self.overlays): |
| 46 |
+ self.add(self.overlays[i], no_write=True) |
| 47 |
+ if not self.repo_conf.sections() and not self.rebuild: |
| 48 |
if ('disable' in self.config.keys() and not |
| 49 |
self.config['disable'][0].lower() == 'all'): |
| 50 |
for i in sorted(self.overlays): |
| 51 |
if not i == delete: |
| 52 |
self.add(self.overlays[i], no_write=True) |
| 53 |
self.repo_conf.write(laymanconf) |
| 54 |
- self.rebuild = False |
| 55 |
return True |
| 56 |
except IOError as error: |
| 57 |
self.output.error('ReposConf: ConfigHandler.write(); Failed to write "'\ |
| 58 |
|
| 59 |
diff --git a/layman/updater.py b/layman/updater.py |
| 60 |
index 6384429..2bfc241 100644 |
| 61 |
--- a/layman/updater.py |
| 62 |
+++ b/layman/updater.py |
| 63 |
@@ -273,7 +273,7 @@ class Main(object): |
| 64 |
# can write the overlays to it. |
| 65 |
open(self.config['repos_conf'], 'w').close() |
| 66 |
from layman.config_modules.reposconf.reposconf import ConfigHandler |
| 67 |
- repos_conf = ConfigHandler(self.config, overlays) |
| 68 |
+ repos_conf = ConfigHandler(self.config, overlays, rebuild=True) |
| 69 |
repos_conf.write() |
Archives