aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael G. Martins <rafael@rafaelmartins.eng.br>2010-07-12 01:15:18 -0300
committerRafael G. Martins <rafael@rafaelmartins.eng.br>2010-07-12 01:15:18 -0300
commit92b68ae53f847990526da9006b4986b800d9b945 (patch)
treeb79c1a5eb7d05171f358d697bac3c1b05ce9c33e /scripts
parentfixed a test case (diff)
downloadg-octave-92b68ae53f847990526da9006b4986b800d9b945.tar.gz
g-octave-92b68ae53f847990526da9006b4986b800d9b945.tar.bz2
g-octave-92b68ae53f847990526da9006b4986b800d9b945.zip
bunch of fixes. added support to paludis
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/g-octave16
1 files changed, 11 insertions, 5 deletions
diff --git a/scripts/g-octave b/scripts/g-octave
index 95527a2..50379f2 100755
--- a/scripts/g-octave
+++ b/scripts/g-octave
@@ -168,12 +168,18 @@ def main():
return os.EX_DATAERR
return os.EX_OK
- from g_octave.package_manager import Portage, Pkgcore
+ from g_octave.package_manager import Portage, Pkgcore, Paludis
if conf_prefetch.package_manager == 'portage':
pkg_manager = Portage(options.ask, options.verbose, options.pretend, not options.colors)
elif conf_prefetch.package_manager == 'pkgcore':
pkg_manager = Pkgcore(options.ask, options.verbose, options.pretend, not options.colors)
+ elif conf_prefetch.package_manager == 'paludis':
+ pkg_manager = Paludis(options.ask, options.verbose, options.pretend, not options.colors)
+ else:
+ print conf_prefetch.package_manager
+ out.eerror('Invalid package manager!')
+ return os.EX_CONFIG
# checking if our overlay is correctly added to PORTDIR_OVERLAY
if not pkg_manager.check_overlay(conf_prefetch.overlay, out):
@@ -256,17 +262,17 @@ def main():
print portage.output.blue('Url:'), portage.output.white(str(pkg.url))
return os.EX_OK
- atom = ebuild.create()
+ atom, catpkg = ebuild.create()
if options.unmerge:
- ret = pkg_manager.uninstall_package(atom)
+ ret = pkg_manager.uninstall_package(atom, catpkg)
elif options.update:
if len(args) > 0:
- ret = pkg_manager.update_package(atom)
+ ret = pkg_manager.update_package(atom, catpkg)
else:
ret = pkg_manager.update_package()
else:
- ret = pkg_manager.install_package(atom)
+ ret = pkg_manager.install_package(atom, catpkg)
if ret != os.EX_OK:
out.eerror('"%s" returned an error.' % conf.package_manager)