| 1 |
commit: ac7cf53481fb33721c84888a461258b99d9f8515 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 9 20:51:13 2013 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Nov 9 21:17:39 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=ac7cf534 |
| 7 |
|
| 8 |
Add missing logger.info messages. |
| 9 |
|
| 10 |
Reduce a debug message being printed multiple times. |
| 11 |
|
| 12 |
--- |
| 13 |
gkeyldap/actions.py | 18 ++++++++++++------ |
| 14 |
1 file changed, 12 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/gkeyldap/actions.py b/gkeyldap/actions.py |
| 17 |
index 7ffa094..07130eb 100644 |
| 18 |
--- a/gkeyldap/actions.py |
| 19 |
+++ b/gkeyldap/actions.py |
| 20 |
@@ -74,6 +74,8 @@ class Actions(object): |
| 21 |
self.output(dev, devs[dev]) |
| 22 |
self.output("============================================") |
| 23 |
self.output("Total number of devs in results:", len(devs)) |
| 24 |
+ self.logger.info("============================================") |
| 25 |
+ self.logger.info("Total number of devs in results: %d" % len(devs)) |
| 26 |
return True |
| 27 |
|
| 28 |
|
| 29 |
@@ -83,6 +85,7 @@ class Actions(object): |
| 30 |
l = LdapSearch() |
| 31 |
if not l.connect(): |
| 32 |
self.output("Aborting Update...Connection failed") |
| 33 |
+ self.logger.info("Aborting Update...Connection failed") |
| 34 |
return False |
| 35 |
results = l.search('*', UID) |
| 36 |
info = l.result2dict(results, 'uid') |
| 37 |
@@ -91,24 +94,25 @@ class Actions(object): |
| 38 |
if not self.create_seedfile(info): |
| 39 |
self.logger.error("Dev seed file update failure: " |
| 40 |
"Original seed file is intact & untouched.") |
| 41 |
- old = self.config['dev-seedfile'] + '.old' |
| 42 |
+ filename = self.config['dev-seedfile'] |
| 43 |
+ old = filename + '.old' |
| 44 |
try: |
| 45 |
self.output("Backing up existing file...") |
| 46 |
+ self.logger.info("Backing up existing file...") |
| 47 |
if os.path.exists(old): |
| 48 |
self.logger.debug( |
| 49 |
"MAIN: _action_updateseeds; Removing 'old' seed file: %s" |
| 50 |
% old) |
| 51 |
os.unlink(old) |
| 52 |
- if os.path.exists(self.config['dev-seedfile']): |
| 53 |
+ if os.path.exists(filename): |
| 54 |
self.logger.debug( |
| 55 |
"MAIN: _action_updateseeds; Renaming current seed file to: " |
| 56 |
"%s" % old) |
| 57 |
- os.rename(self.config['dev-seedfile'], old) |
| 58 |
+ os.rename(filename, old) |
| 59 |
self.logger.debug( |
| 60 |
"MAIN: _action_updateseeds; Renaming '.new' seed file to: %s" |
| 61 |
- % self.config['dev-seedfile']) |
| 62 |
- os.rename(self.config['dev-seedfile'] + '.new', |
| 63 |
- self.config['dev-seedfile']) |
| 64 |
+ % filename) |
| 65 |
+ os.rename(filename + '.new', filename) |
| 66 |
except IOError: |
| 67 |
raise |
| 68 |
self.output("Developer Seed file updated") |
| 69 |
@@ -132,6 +136,8 @@ class Actions(object): |
| 70 |
count += 1 |
| 71 |
self.output("Total number of seeds created:", count) |
| 72 |
self.output("Seeds created...saving file: %s" % filename) |
| 73 |
+ self.logger.info("Total number of seeds created: %d" % count) |
| 74 |
+ self.logger.info("Seeds created...saving file: %s" % filename) |
| 75 |
return self.seeds.save() |
Archives