Kaydet (Commit) 2dc2fd27 authored tarafından Suleyman Poyraz's avatar Suleyman Poyraz Kaydeden (comit) GitHub

Merge pull request #5 from Zaryob/develop

master...Zaryob:develop?expand=1
......@@ -59,7 +59,7 @@ class RunTimeError(inary.actionsapi.Error):
def get_config(config):
return os.popen("ruby -rrbconfig -e 'puts Config::CONFIG[\"{}\"]'".format(config)).read().strip()
return os.popen("ruby -rrbconfig -e 'puts RbConfig::CONFIG[\"{}\"]'".format(config)).read().strip()
def get_ruby_version():
......@@ -73,6 +73,9 @@ def get_rubylibdir():
def get_sitedir():
return get_config('sitedir')
def get_gemdir():
return os.popen('gem env gemdir').read().strip()
def get_ruby_install_name():
return get_config('ruby_install_name')
......@@ -87,6 +90,8 @@ def get_gemhome():
def get_sitelibdir():
return get_config('sitelibdir')
def generate_gemname():
return "-".join(get.srcNAME().split("-")[1:])
def auto_dodoc():
from inary.actionsapi.inarytools import dodoc
......@@ -103,7 +108,7 @@ def auto_dodoc():
def install(parameters=''):
"""does ruby setup.rb install"""
if system(
'ruby -w setup.rb --prefix=/{0.defaultprefixDIR()} --destdir={0.installDIR()} {1}'.format(get, parameters)):
'ruby -w setup.rb --prefix=/{0}/{1} --destdir={1} {2}'.format(get.defaultprefixDIR(), get_gemdir(), get.installDIR(), parameters)):
raise InstallError(_('Install failed.'))
auto_dodoc()
......@@ -116,6 +121,17 @@ def rake_install(parameters=''):
auto_dodoc()
def gem_build(parameters=''):
if system('gem build {} {}'.format(generate_gemname(), parameters)):
raise InstallError(_('Build failed.'))
def gem_install(parameters=''):
"""Make installation from GemFile"""
if system('gem install --backtrace {0} -i "{1}{2}" -n "{1}/usr/bin" {3}.gem'.format(parameters, get.installDIR(), get_gemdir() , generate_gemname() + "-" + get.srcVERSION())):
raise InstallError(_('Install failed.'))
auto_dodoc()
def run(parameters=''):
"""executes parameters with ruby"""
......
......@@ -77,8 +77,11 @@ class Check(command.Command, metaclass=command.autocommand):
elif self.args:
pkgs = self.args
else:
ctx.ui.info(_('Checking all installed packages.') + '\n')
ctx.ui.info(_('Checking all installed packages.'), color='blue')
pkgs = inary.db.installdb.InstallDB().list_installed()
if not pkgs:
ctx.ui.error(_("No package has been installed yet. :("))
exit()
necessary_permissions = True
......
......@@ -46,7 +46,6 @@ You can also give the name of a component.
def options(self):
group = optparse.OptionGroup(self.parser, _("emergeup options"))
super(EmergeUp, self).add_options(group)
group.add_option("-c", "--component", action="store",
default=None, help=_("Emerge available packages under given component"))
group.add_option("--ignore-file-conflicts", action="store_true",
......
......@@ -51,7 +51,7 @@ Remove all orphaned packages from the system.
self.parser.add_option_group(group)
def run(self):
self.init(database=True, write=False)
self.init()
orphaned = self.installdb.get_orphaned()
if ctx.get_option('exclude'):
orphaned = inary.blacklist.exclude(orphaned, ctx.get_option('exclude'))
......
......@@ -101,11 +101,13 @@ def calculate_free_space_needed(order):
else:
total_needed += int(packagedb.get_package(pkg.name).installedSize)
needed, symbol = util.human_readable_size(total_needed)
if total_needed < 0:
ctx.ui.info(_("After this operation, {:.2f} {} space will be freed.").format(needed, symbol), color='cyan')
ctx.ui.info(_("After this operation, {:.2f} {} space will be freed.").format(abs(int(needed)), symbol), color='cyan')
else:
ctx.ui.info(_("After this operation, {:.2f} {} space will be used.").format(needed, symbol), color='cyan')
ctx.ui.info(_("After this operation, {:.2f} {} space will be used.").format(abs(int(needed)), symbol), color='cyan')
return total_needed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment