diff options
| -rw-r--r-- | docs/conf.py | 4 | ||||
| -rw-r--r-- | g_octave/__init__.py | 2 | ||||
| -rw-r--r-- | g_octave/package_manager.py | 4 | ||||
| -rwxr-xr-x | scripts/g-octave | 21 |
4 files changed, 22 insertions, 9 deletions
diff --git a/docs/conf.py b/docs/conf.py index a417a3e..9a7353c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -45,9 +45,9 @@ copyright = u'2010, Rafael Goncalves Martins' # built documents. # # The short X.Y version. -version = '0.2' +version = '0.3' # The full version, including alpha/beta/rc tags. -release = '0.2' +release = '0.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/g_octave/__init__.py b/g_octave/__init__.py index 9f4cf91..2ea55bd 100644 --- a/g_octave/__init__.py +++ b/g_octave/__init__.py @@ -32,4 +32,4 @@ __url__ = 'http://g-octave.rafaelmartins.eng.br/' __copyright__ = '(c) 2009-2010 %s' % __author__ __license__ = 'GPLv2' -__version__ = '0.2.1' +__version__ = '0.3' diff --git a/g_octave/package_manager.py b/g_octave/package_manager.py index 781f568..360a7b3 100644 --- a/g_octave/package_manager.py +++ b/g_octave/package_manager.py @@ -137,6 +137,10 @@ class Pkgcore(Base): for line in p.stdout: packages.append(line.strip()) return packages + + def create_manifest(self, ebuild): + # using portage :( + return subprocess.call(['ebuild', ebuild, 'manifest']) class Paludis(Base): diff --git a/scripts/g-octave b/scripts/g-octave index 33b3a62..fd36d9d 100755 --- a/scripts/g-octave +++ b/scripts/g-octave @@ -13,7 +13,7 @@ has_fetch = True -__issue_tracker = 'http://g-octave.rafaelmartins.eng.br/report' +__issue_tracker = 'Mail to: rafael@rafaelmartins.eng.br' import sys @@ -226,9 +226,9 @@ def main(): return os.EX_OK else: - log.info('You cant fetch package databases.') + log.info('You can\'t fetch package databases.') if options.sync: - log.error('You cant fetch package databases.') + log.error('You can\'t fetch package databases.') out.eerror('"--sync" not available, please install g-octave-9999 if you want this.') return os.EX_USAGE @@ -254,8 +254,8 @@ def main(): if options.update: pass elif len(args) == 0: - log.error('You need provide a package an argument.') - out.eerror('You need provide a package an argument.') + log.error('You need provide an argument.') + out.eerror('You need provide an argument.') return os.EX_USAGE elif len(args) > 1: log.error('g-octave can install only one package at once.') @@ -328,39 +328,48 @@ if __name__ == '__main__': try: return_code = main() except ConfigException, error: + log.error('Config class error - %s' % error) out.eerror('Config class error - %s' % error) return_code = os.EX_CONFIG except DescriptionException, error: + log.error('Description class error - %s' % error) out.eerror('Description class error - %s' % error) return_code = os.EX_SOFTWARE except DescriptionTreeException, error: + log.error('DescriptionTree class error - %s' % error) out.eerror('DescriptionTree class error - %s' % error) return_code = os.EX_SOFTWARE except EbuildException, error: + log.error('Ebuild class error - %s' % error) out.eerror('Ebuild class error - %s' % error) return_code = os.EX_SOFTWARE except FetchException, error: + log.error('Fetch module error - %s' % error) out.eerror('Fetch module error - %s' % error) return_code = os.EX_SOFTWARE except OSError, error: + log.error('Operating System error - %s' % error) out.eerror('Operating System error - %s' % error) out.eerror('Try run "g-octave" as root.') return_code = os.EX_OSERR except IOError, error: + log.error('I/O error - %s' % error) out.eerror('I/O error - %s' % error) out.eerror('Try run "g-octave" as root.') return_code = os.EX_IOERR except KeyError, error: + log.error('Key error - %s' % error) out.eerror('Key error - %s' % error) out.eerror('Probably you have more than one overlay configured to use with g-octave') out.eerror('Try remove the oldest and maintain only the overlay actually in use.') return_code = os.EX_SOFTWARE except Exception, error: + log.error('Unknown error - %s' % error) out.eerror('Unknown error - %s' % error) return_code = os.EX_SOFTWARE if return_code not in [os.EX_OK, os.EX_CONFIG, os.EX_USAGE, os.EX_DATAERR]: out.einfo('If you fell that this is a bug, please report to us.') - out.einfo('Issue tracker: %s' % __issue_tracker) + out.einfo(__issue_tracker) sys.exit(return_code) |