Merge lp:~mac9416/keryx/1.0 into lp:~keryx-admins/keryx/1.0

[mac9416]

[mac9416 (mac9416)]

AptRepoClient.update_local now defaults to loading from /var/lib/apt/lists.
Implemented listsources command.
Download now fails if package is already installed and up-to-date.

[Chris Oliver (excid3)]

review: Approve

=== modified file 'doc/TODO'
--- doc/TODO	2009-12-26 04:18:56 +0000
+++ doc/TODO	2010-01-09 15:35:24 +0000
@@ -34,6 +34,7 @@
 keryx-cli
 =========
 - Use proper python documentation of functions and classes so that documenation can be dynamically created
+- Sources editor
 - Command-line only
   - takes parameters as well as interactive prompts
 - ncurses for graphical CLI usage? (future version)

=== modified file 'src/cli.py'
--- src/cli.py	2010-01-08 03:31:53 +0000
+++ src/cli.py	2010-01-09 15:35:24 +0000
@@ -211,6 +211,9 @@
             'install': [self.install, -1,
                      "Usage: install, or install <packages>",
                      "Installs packages to the offline machine"],
+            'listsources': [self.listsources, 0,
+                     "Usage: listsources",
+                     "Lists software sources in use"],
         }
         self.register(functions)
 
@@ -230,3 +233,6 @@
     def install(self, *packages):
         self.project.Install(packages)
 
+    def listsources(self):
+        self.project.ListSources()
+

=== modified file 'src/libkeryx/definition.py'
--- src/libkeryx/definition.py	2010-01-08 04:16:07 +0000
+++ src/libkeryx/definition.py	2010-01-09 15:35:24 +0000
@@ -127,6 +127,12 @@
             raise AttributeError, "Project does not exist"
         self.OnPkgNames()
 
+    def ListSources(self):
+        if not self.Exists():
+            raise AttributeError, "Project does not exist"
+        self.OnListSources()
+
+
 ###############################################################################
 # Overridable functions
 
@@ -150,4 +156,6 @@
         logging.error("OnSearch not implemented yet")
     def OnPkgNames(self):
         logging.error("OnPkgNames not implemented yet")
+    def OnListSources(self):
+        logging.error("OnPkgNames not implemented yet")
     

=== modified file 'src/libkeryx/definitions/apt_def/__init__.py'
--- src/libkeryx/definitions/apt_def/__init__.py	2010-01-08 04:16:07 +0000
+++ src/libkeryx/definitions/apt_def/__init__.py	2010-01-09 15:35:24 +0000
@@ -230,6 +230,22 @@
         print "Finished installing.\n" \
               "Orange you glad you used %s?" % (keryx.__appname__.capitalize())
 
+
+    def OnListSources(self):
+        """Prints a numbered list of software source lines"""
+        # Get project's repo relationships
+        rels = self.session.query(Relation). \
+                filter(Relation.project_id==self.project_ref.id). \
+                filter(Relation.type=="repo").all()
+        
+        # Get items out of each repo
+        repos = [" ".join(self.session.query(Repo). \
+                    filter(Repo.id==i.target_id).one().items()) for i in rels]
+
+        # Make a numbered list of repo lines
+        repos = ["%i\t%s" % (x, y) for x, y in zip(xrange(len(repos)), repos)]
+        print "\n".join(repos)
+
 ###############################################################################
 
     def __add_repositories(self, folder="/etc/apt/"):
@@ -336,6 +352,7 @@
         if not ver:
             url, ver = self.apt_client.get_best_binary_version(package)
         
+        # Get package info (depends, description, etc.)
         pkg = self.apt_client.get_binary_name_version(package, ver)
         if pkg:
             pkg = pkg[0]
@@ -355,6 +372,7 @@
 
         # Iterate through each package
         for dep in dependencies:
+            # Get "or" packages
             dep = dep.split('|')
 
             # Build (name, version) tuples for each in this section

=== modified file 'src/libkeryx/definitions/apt_def/minideblib/AptRepoClient.py'
--- src/libkeryx/definitions/apt_def/minideblib/AptRepoClient.py	2010-01-04 22:19:41 +0000
+++ src/libkeryx/definitions/apt_def/minideblib/AptRepoClient.py	2010-01-09 15:35:24 +0000
@@ -328,7 +328,7 @@
     # Alias for load_repos(). Just to make commandline apt-get users happy
     update = load_repos
 
-    def load_local(self, folder, repoline = None, ignore_errors = True, clear = True):
+    def load_local(self, folder="/var/lib/apt/lists", repoline = None, ignore_errors = True, clear = True):
         """Loads repositories into internal data structures from a local cache. Replaces previous content if clear = True (default)"""
         self.load_repos(repoline, ignore_errors, clear, folder)
         

=== modified file 'src/libkeryx/factory.py'
--- src/libkeryx/factory.py	2010-01-06 14:34:53 +0000
+++ src/libkeryx/factory.py	2010-01-09 15:35:24 +0000
@@ -51,7 +51,7 @@
     try:
         return getattr(definitions[0], definitions[0].__name__)(name, db_file)
     except Exception, e:
-        print e
+        logging.error(e)
     
     
 # Entry point