[equo] some more code cleanup and polishing

client/equo.py

@@ -233,10 +233,10 @@ help_opts_extended = [
     (1, 'database', 1, _('handles installed packages database')),
         (2, 'check', 2, _('check System Database for errors')),
         (2, 'vacuum', 2, _('remove System Database internal indexes to save space')),
-        (2, 'generate', 1, 'generate installed packages database using Portage database (Portage needed)'),
+        (2, 'generate', 1, _('generate installed packages database using Source Package Manager repositories')),
         (2, 'resurrect', 1, _('generate installed packages database using files on the system [last hope]')),
         (2, 'revdeps', 1, _('regenerate reverse dependencies metadata')),
-        (2, 'counters', 1, _('update/generate counters table (Portage <-> Entropy packages table)')),
+        (2, 'spmuids', 1, _('regenerate SPM UIDs map (SPM <-> Entropy packages)')),
         (2, 'spmsync', 1, _('makes Entropy aware of your Source Package Manager updated packages')),
         (2, 'backup', 2, _('backup the current Entropy installed packages database')),
         (2, 'restore', 1, _('restore a previously backed up Entropy installed packages database')),
@@ -285,7 +285,7 @@ help_opts_extended = [
             (3, 'md5remote', 2, _('verify remote integrity of the provided atoms (or world)')),
             (3, 'backup', 3, _('backup current repository database')),
             (3, 'restore', 3, _('restore a previously backed-up repository database')),
-            (3, 'counters', 2, _('resync counters table (Portage <-> Entropy matching scheme)'),),
+            (3, 'spmuids', 2, _('regenerate SPM UIDs map (SPM <-> Entropy packages)'),),
 
         None,
 
@@ -426,7 +426,7 @@ if (options[0] == "--version"):
     raise SystemExit(0)
 elif (options[0] == "--info"):
     import text_rescue
-    text_rescue.getinfo()
+    text_rescue.database(["info"])
     raise SystemExit(0)
 
 def do_moo():
@@ -524,8 +524,6 @@ def main():
         elif (options[0] == "database"):
             import text_rescue
             rc = text_rescue.database(options[1:])
-            # FIXME: refactor text_rescue
-            text_rescue.Equo.destroy()
 
         elif (options[0] == "ugc"):
             import text_ugc
@@ -575,16 +573,14 @@ def main():
                 elif myopts[0] == "database":
 
                     do = True
-                    # hook to support counters command, which is just
+                    # hook to support spmuids command, which is just
                     # a duplicate of 'equo database counters'
                     # put here for completeness
                     if len(myopts) > 1:
-                        if myopts[1] == "counters":
+                        if myopts[1] == "spmuids":
                             do = False
                             import text_rescue
                             rc = text_rescue.database(myopts[1:])
-                            # FIXME: refactor text_rescue
-                            text_rescue.Equo.destroy()
 
                     if do:
                         try:

docs/man/equo.pod

@@ -694,7 +694,7 @@ remove System Database internal indexes to save space
 
 =item B<generate>
 
-generate installed packages database using Portage database (Portage needed)
+generate installed packages database using Source Package Manager repositories
 
 =item B<resurrect>
 
@@ -704,9 +704,9 @@ generate installed packages database using files on the system [last hope]
 
 regenerate reverse dependencies metadata
 
-=item B<counters>
+=item B<spmuids>
 
-update/generate counters table (Portage <-> Entropy packages table)
+regenerate SPM UIDs map (SPM <-> Entropy packages)
 
 =item B<spmsync>
 
@@ -946,6 +946,12 @@ restore a previously backed-up repository database
 
 =back
 
+=item B<spmuids>
+
+regenerate SPM UIDs map (SPM <-> Entropy packages)
+
+=back
+
 
 =item B<repo>
 

docs/man/man1/equo.1

@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EQUO 1"
-.TH EQUO 1 "2009-12-22" "perl v5.8.8" "Entropy"
+.TH EQUO 1 "2009-12-23" "perl v5.8.8" "Entropy"
 .SH "NAME"
 \&\fBequo\fR \- Official Sabayon Linux Package Manager Client
 .SH "SYNOPSIS"
@@ -663,16 +663,16 @@ check System Database for errors
 remove System Database internal indexes to save space
 .IP "\fBgenerate\fR" 4
 .IX Item "generate"
-generate installed packages database using Portage database (Portage needed)
+generate installed packages database using Source Package Manager repositories
 .IP "\fBresurrect\fR" 4
 .IX Item "resurrect"
 generate installed packages database using files on the system [last hope]
 .IP "\fBrevdeps\fR" 4
 .IX Item "revdeps"
 regenerate reverse dependencies metadata
-.IP "\fBcounters\fR" 4
-.IX Item "counters"
-update/generate counters table (Portage <\-> Entropy packages table)
+.IP "\fBspmuids\fR" 4
+.IX Item "spmuids"
+regenerate \s-1SPM\s0 UIDs map (\s-1SPM\s0 <\-> Entropy packages)
 .IP "\fBspmsync\fR" 4
 .IX Item "spmsync"
 makes Entropy aware of your Source Package Manager updated packages
@@ -846,6 +846,12 @@ restore a previously backed-up repository database
 .RE
 .RS 4
 .RE
+.IP "\fBspmuids\fR" 4
+.IX Item "spmuids"
+regenerate \s-1SPM\s0 UIDs map (\s-1SPM\s0 <\-> Entropy packages)
+.RE
+.RS 4
+.RE
 .IP "\fBrepo\fR" 4
 .IX Item "repo"
 manage a repository
@@ -995,12 +1001,9 @@ verify the integrity of local package files
 .IX Item "revdeps"
 regenerate reverse dependencies metadata
 .RE
-.RS 4
-.RE
-.IP "\fBugc\fR" 4
+.IP "\fBugc\fR"
 .IX Item "ugc"
 handles User Generated Content features
-.RS 4
 .IP "\fBlogin <repository\fR>" 4
 .IX Item "login <repository>"
 login against a specified repository
@@ -1044,12 +1047,9 @@ add vote for the specified package key (example: x11\-libs/qt)
 .RS 4
 .RE
 .RE
-.RS 4
-.RE
-.IP "\fBcache\fR" 4
+.IP "\fBcache\fR"
 .IX Item "cache"
 handles Entropy cache
-.RS 4
 .IP "\fBclean\fR" 4
 .IX Item "clean"
 clean Entropy cache
@@ -1063,12 +1063,11 @@ show more details
 .IX Item "--quiet"
 print results in a scriptable way
 .RE
-.RS 4
-.RE
-.IP "\fBcleanup\fR" 4
+.IP "\fBcleanup\fR"
 .IX Item "cleanup"
 remove downloaded packages and clean temp. directories
-.IP "\fB\-\-info\fR" 4
+.RE
+.IP "\fB\-\-info\fR"
 .IX Item "--info"
 show system information
 .SH "ENVIRONMENT"