fix dependencies

This commit is contained in:
Dimitris Zlatanidis 2015-01-21 01:02:59 +02:00
parent 93e45aadbd
commit 2b9c9edd34
5 changed files with 9 additions and 10 deletions

View file

@ -50,7 +50,7 @@ from __metadata__ import (
from pkg.build import BuildPackage
from pkg.manager import PackageManager
from sbo.check import exists
from sbo.check import sbo_upgrade
from sbo.views import SBoNetwork
from sbo.slackbuild import SBoInstall
@ -76,7 +76,7 @@ class Case(object):
OthersInstall(self.package, repo, self.release).start()
def sbo_upgrade(self):
SBoInstall(exists()).start()
SBoInstall(sbo_upgrade()).start()
def slack_upgrade(self):
Patches(self.release).start()

View file

@ -47,7 +47,7 @@ class Dependencies(object):
if requires:
for req in requires:
index += 1
toolbar_width = status(index, toolbar_width, 1)
toolbar_width = status(index, toolbar_width, 7)
if req and req not in blacklist:
dependencies.append(req)
if dependencies:

View file

@ -24,6 +24,7 @@
import os
from slpkg.toolbar import status
from slpkg.splitting import split_package
from slpkg.slack.slack_version import slack_ver
from slpkg.__metadata__ import (
lib_path,
@ -207,10 +208,10 @@ class Requires(object):
f.close()
for line in PACKAGES_TXT.splitlines():
if line.startswith("PACKAGE NAME:"):
pkg_name = line[13:].strip().split('-')[0]
pkg_name = split_package(line[14:].strip())[0]
if line.startswith("PACKAGE REQUIRED:"):
if pkg_name == self.name:
if line[16:].strip():
if line[18:].strip():
return self._req_fix(line)
def _req_fix(self, line):

View file

@ -230,7 +230,7 @@ class OthersInstall(object):
for dep in self.packages:
requires += Dependencies().others(dep, self.repo)
dependencies = dimensional_list(requires)
dependencies.reverse()
# dependencies.reverse()
return remove_dbs(dependencies)
def views(self, install, comp_sum):

View file

@ -36,11 +36,9 @@ from greps import SBoGrep
from search import sbo_search_pkg
def exists():
def sbo_upgrade():
'''
Search packages if exists in the repository
and it gets to avoidable modified packages
from the user with the tag _SBo
Return packages for upgrade
'''
try:
sys.stdout.write("{0}Checking ...{1}".format(color['GREY'],