* [gentoo-commits] proj/portage:master commit in: pym/portage/emaint/modules/config/
@ 2012-09-02 19:47 Zac Medico
0 siblings, 0 replies; 4+ messages in thread
From: Zac Medico @ 2012-09-02 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 6a4d36cf51ceac6e300a38b7e1272625e291c9a6
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 2 19:46:46 2012 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep 2 19:46:46 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6a4d36cf
emaint cleanconfmem: ignore md5, bug #433694
---
pym/portage/emaint/modules/config/config.py | 33 +++++---------------------
1 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/pym/portage/emaint/modules/config/config.py b/pym/portage/emaint/modules/config/config.py
index a80d87d..e028852 100644
--- a/pym/portage/emaint/modules/config/config.py
+++ b/pym/portage/emaint/modules/config/config.py
@@ -4,7 +4,6 @@
import portage
from portage import os
from portage.const import PRIVATE_PATH
-from portage.checksum import perform_md5
class CleanConfig(object):
@@ -32,43 +31,32 @@ class CleanConfig(object):
onProgress = kwargs.get('onProgress', None)
configs = self.load_configlist()
messages = []
- chksums = []
maxval = len(configs)
if onProgress:
onProgress(maxval, 0)
i = 0
keys = sorted(configs)
for config in keys:
- if os.path.exists(config):
- md5sumactual = perform_md5(config)
- if md5sumactual != configs[config]:
- chksums.append(" %s" % config)
- else:
+ if not os.path.exists(config):
messages.append(" %s" % config)
if onProgress:
onProgress(maxval, i+1)
i += 1
- return self._format_output(messages, chksums)
+ return self._format_output(messages)
def fix(self, **kwargs):
onProgress = kwargs.get('onProgress', None)
configs = self.load_configlist()
messages = []
- chksums = []
maxval = len(configs)
if onProgress:
onProgress(maxval, 0)
i = 0
keys = sorted(configs)
for config in keys:
- if os.path.exists(config):
- md5sumactual = perform_md5(config)
- if md5sumactual != configs[config]:
- chksums.append(" %s" % config)
- configs.pop(config)
- else:
- configs.pop(config)
- messages.append(" %s" % config)
+ if not os.path.exists(config):
+ configs.pop(config)
+ messages.append(" %s" % config)
if onProgress:
onProgress(maxval, i+1)
i += 1
@@ -80,9 +68,9 @@ class CleanConfig(object):
lines.append('')
with open(self.target, 'w') as configfile:
configfile.write('\n'.join(lines))
- return self._format_output(messages, chksums, True)
+ return self._format_output(messages, True)
- def _format_output(self, messages=[], chksums=[], cleaned=False):
+ def _format_output(self, messages=[], cleaned=False):
output = []
if messages:
output.append('Not Installed:')
@@ -91,11 +79,4 @@ class CleanConfig(object):
if cleaned:
tot += ' ...Cleaned'
output.append(tot % len(messages))
- if chksums:
- output.append('\nChecksums did not match:')
- output += chksums
- tot = '------------------------------------\n Total %i Checksums did not match'
- if cleaned:
- tot += ' ...Cleaned'
- output.append(tot % len(chksums))
return output
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/portage/emaint/modules/config/
@ 2012-09-02 20:04 Zac Medico
0 siblings, 0 replies; 4+ messages in thread
From: Zac Medico @ 2012-09-02 20:04 UTC (permalink / raw
To: gentoo-commits
commit: b7f39b5f439cc7c3563706478d1ebafca7fde074
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 2 20:04:38 2012 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep 2 20:04:38 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b7f39b5f
emaint cleanconfmem: use writedict
---
pym/portage/emaint/modules/config/config.py | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/pym/portage/emaint/modules/config/config.py b/pym/portage/emaint/modules/config/config.py
index e028852..33bd19c 100644
--- a/pym/portage/emaint/modules/config/config.py
+++ b/pym/portage/emaint/modules/config/config.py
@@ -4,7 +4,7 @@
import portage
from portage import os
from portage.const import PRIVATE_PATH
-
+from portage.util import writedict
class CleanConfig(object):
@@ -53,21 +53,17 @@ class CleanConfig(object):
onProgress(maxval, 0)
i = 0
keys = sorted(configs)
+ modified = False
for config in keys:
if not os.path.exists(config):
+ modified = True
configs.pop(config)
messages.append(" %s" % config)
if onProgress:
onProgress(maxval, i+1)
i += 1
- lines = []
- keys = sorted(configs)
- for key in keys:
- line = ' '.join([key, configs[key]])
- lines.append(line)
- lines.append('')
- with open(self.target, 'w') as configfile:
- configfile.write('\n'.join(lines))
+ if modified:
+ writedict(configs, self.target)
return self._format_output(messages, True)
def _format_output(self, messages=[], cleaned=False):
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/portage/emaint/modules/config/
@ 2012-09-02 20:33 Zac Medico
0 siblings, 0 replies; 4+ messages in thread
From: Zac Medico @ 2012-09-02 20:33 UTC (permalink / raw
To: gentoo-commits
commit: b7d972b4d18ad726c70f35b8026cbd94b2dc3b5f
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 2 20:33:06 2012 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep 2 20:33:06 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b7d972b4
emaint cleanconfmem: handle ROOT
---
pym/portage/emaint/modules/config/config.py | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/pym/portage/emaint/modules/config/config.py b/pym/portage/emaint/modules/config/config.py
index 33bd19c..f20068c 100644
--- a/pym/portage/emaint/modules/config/config.py
+++ b/pym/portage/emaint/modules/config/config.py
@@ -11,6 +11,7 @@ class CleanConfig(object):
short_desc = "Discard any no longer installed configs from emerge's tracker list"
def __init__(self):
+ self._root = portage.settings["ROOT"]
self.target = os.path.join(portage.settings["EROOT"], PRIVATE_PATH, 'config')
def name():
@@ -52,10 +53,17 @@ class CleanConfig(object):
if onProgress:
onProgress(maxval, 0)
i = 0
- keys = sorted(configs)
+
+ root = self._root
+ if root == "/":
+ root = None
modified = False
- for config in keys:
- if not os.path.exists(config):
+ for config in sorted(configs):
+ if root is None:
+ full_path = config
+ else:
+ full_path = os.path.join(root, config.lstrip(os.sep))
+ if not os.path.exists(full_path):
modified = True
configs.pop(config)
messages.append(" %s" % config)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/portage/emaint/modules/config/
@ 2012-09-02 23:47 Zac Medico
0 siblings, 0 replies; 4+ messages in thread
From: Zac Medico @ 2012-09-02 23:47 UTC (permalink / raw
To: gentoo-commits
commit: 03236ec6bf2040468aeb1bb308fec072aac8cc1b
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 2 23:46:54 2012 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep 2 23:46:54 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=03236ec6
emaint cleanconfmem: fix writedict breakage
Use grabdict so the values are stored as lists like writedict expects.
---
pym/portage/emaint/modules/config/config.py | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/pym/portage/emaint/modules/config/config.py b/pym/portage/emaint/modules/config/config.py
index f20068c..dad024b 100644
--- a/pym/portage/emaint/modules/config/config.py
+++ b/pym/portage/emaint/modules/config/config.py
@@ -4,7 +4,7 @@
import portage
from portage import os
from portage.const import PRIVATE_PATH
-from portage.util import writedict
+from portage.util import grabdict, writedict
class CleanConfig(object):
@@ -19,14 +19,7 @@ class CleanConfig(object):
name = staticmethod(name)
def load_configlist(self):
-
- configs = {}
- with open(self.target, 'r') as configfile:
- lines = configfile.readlines()
- for line in lines:
- ls = line.split()
- configs[ls[0]] = ls[1]
- return configs
+ return grabdict(self.target)
def check(self, **kwargs):
onProgress = kwargs.get('onProgress', None)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-02 23:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-02 20:04 [gentoo-commits] proj/portage:master commit in: pym/portage/emaint/modules/config/ Zac Medico
-- strict thread matches above, loose matches on Subject: below --
2012-09-02 23:47 Zac Medico
2012-09-02 20:33 Zac Medico
2012-09-02 19:47 Zac Medico
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox