diff options
| -rw-r--r-- | g_octave/description.py | 1 | ||||
| -rw-r--r-- | g_octave/description_tree.py | 26 | ||||
| -rw-r--r-- | g_octave/ebuild.py | 6 | ||||
| -rwxr-xr-x | setup.py | 10 |
4 files changed, 19 insertions, 24 deletions
diff --git a/g_octave/description.py b/g_octave/description.py index c951a1c..8fcd383 100644 --- a/g_octave/description.py +++ b/g_octave/description.py @@ -18,6 +18,7 @@ from __future__ import absolute_import __all__ = [ 'Description', + 'SvnDescription', 're_depends', 're_pkg_atom' ] diff --git a/g_octave/description_tree.py b/g_octave/description_tree.py index a2a59cf..736b0c9 100644 --- a/g_octave/description_tree.py +++ b/g_octave/description_tree.py @@ -24,13 +24,6 @@ from portage.versions import vercmp from .config import Config from .description import * from .exception import ConfigException, DescriptionTreeException - -has_svn = True -try: - from .svn import * -except ImportError: - has_svn = False - from .log import Log log = Log('g_octave.description_tree') @@ -174,11 +167,24 @@ class DescriptionTree(object): for pkg in self.pkg_list[cat]: if re_term.search(pkg['name']) is not None: if pkg['name'] not in packages: - packages[pkg['name']] = [pkg['version']] - if has_svn: - packages[pkg['name']].append('9999') + packages[pkg['name']] = [pkg['version'], '9999'] else: packages[pkg['name']].insert(-1, pkg['version']) + packages[pkg['name']].sort(key=cmp_to_key(vercmp)) return packages + def list(self): + + packages = {} + + for cat in self.pkg_list: + packages[cat] = {} + for pkg in self.pkg_list[cat]: + if pkg['name'] not in packages[cat]: + packages[cat][pkg['name']] = [pkg['version'], '9999'] + else: + packages[cat][pkg['name']].insert(-1, pkg['version']) + packages[cat][pkg['name']].sort(key=cmp_to_key(vercmp)) + + return packages diff --git a/g_octave/ebuild.py b/g_octave/ebuild.py index 1edfada..a744226 100644 --- a/g_octave/ebuild.py +++ b/g_octave/ebuild.py @@ -24,12 +24,6 @@ from .description_tree import * from .exception import EbuildException from .compat import open -has_svn = True -try: - from .description import SvnDescription -except: - has_svn = False - import os import portage import re @@ -130,19 +130,13 @@ setup( author = g_octave.__author__, author_email = g_octave.__email__, url = g_octave.__url__, - packages = [ - 'g_octave', - 'g_octave.svn', - ], + packages = ['g_octave'], scripts = ['scripts/g-octave'], data_files = [ ('/etc', ['etc/g-octave.cfg']), ('share/g-octave', ['share/g-octave.eclass']), ], - requires = [ - 'portage', - 'pysvn', - ], + requires = ['portage'], cmdclass = { 'sdist': sdist, 'build': build, |