Kaydet (Commit) 75cf5059 authored tarafından Suleyman Poyraz's avatar Suleyman Poyraz

Merge branch 'patch-41833' into develop

* patch-41833:
  İlk bulunmayan kırık bağımlılıkta durma sorunu çözüldü

 Conflicts:
	inary/operations/install.py

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
 and try again.
......@@ -304,7 +304,7 @@ def plan_install_pkg_names(A):
for x in A:
G_f.add_package(x)
B = A
not_satisfied=dict()
while len(B) > 0:
Bp = set()
for x in B:
......@@ -314,10 +314,15 @@ def plan_install_pkg_names(A):
# we don't deal with already *satisfied* dependencies
if not dep.satisfied_by_installed():
if not dep.satisfied_by_repo(packagedb=packagedb) and not ctx.config.get_option('ignore_satisfy'):
raise Exception(_('\"{0}\" dependency of package \"{1}\" is not satisfied.').format(dep, pkg.name))
if dep in not_satisfied:
not_satisfied[dep]+=[pkg.name]
else:
not_satisfied[dep]=[pkg.name]
pass
if not dep.package in G_f.vertices():
Bp.add(str(dep.package))
G_f.add_dep(x, dep)
if ctx.config.values.general.allow_docs:
dep = x + ctx.const.doc_package_end
if packagedb.has_package(dep):
......@@ -338,8 +343,12 @@ def plan_install_pkg_names(A):
if packagedb.has_package(dep):
Bp.add(dep)
G_f.add_package(dep)
B = Bp
if not_satisfied:
msg=_("Following packages are not satisfied:\n")
for ns in not_satisfied:
msg+=(_(' -> \"{0}\" dependency(s) of package \"{1}\" is not satisfied.\n').format(not_satisfied[ns], ns))
raise Exception(msg)
if ctx.config.get_option('debug'):
G_f.write_graphviz(sys.stdout)
order = G_f.topological_sort()
......
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