Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-01-30 20:34:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

update code

Browse source
This commit is contained in:
Dimitris Zlatanidis 2014-11-06 11:11:32 +02:00
parent e2d21253c6
commit 99f47d7418
1 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
slpkg/sbo/slackbuild.py
View file

@ -63,8 +63,7 @@ class SBoInstall(object):
''' '''
try: try:
if self.dependencies_list or sbo_search_pkg(self.name) is not None: if self.dependencies_list or sbo_search_pkg(self.name) is not None:
requires = one_for_all(self.name, self.dependencies_list) dependencies = self.remove_dbs()
dependencies = remove_dbs(requires)
# sbo versions = idata[0] # sbo versions = idata[0]
# package arch = idata[1] # package arch = idata[1]
# package sum = idata[2] # package sum = idata[2]
@ -110,7 +109,7 @@ class SBoInstall(object):
b_ins = build_install(dependencies, idata[0]) b_ins = build_install(dependencies, idata[0])
reference(count[1], msg[0], count[0], msg[1], reference(count[1], msg[0], count[0], msg[1],
b_ins[0], b_ins[2], b_ins[1]) b_ins[0], b_ins[2], b_ins[1])
write_deps(self.name, dependencies) write_deps(dependencies)
else: else:
count_installed = count_uninstalled = 0 count_installed = count_uninstalled = 0
# sbo matching = mdata[0] # sbo matching = mdata[0]
@ -147,28 +146,27 @@ class SBoInstall(object):
print # new line at exit print # new line at exit
sys.exit() sys.exit()
def one_for_all(self):
'''
Create one list for all packages
'''
requires = []
requires.append(self.name)
for pkg in self.dependencies_list:
requires += pkg
requires.reverse()
return requires
def one_for_all(name, dependencies): def remove_dbs(self):
''' '''
Create one list for all packages Remove double dependencies
''' '''
requires = [] requires = self.one_for_all()
requires.append(name) dependencies = []
for pkg in dependencies: for duplicate in requires:
requires += pkg if duplicate not in dependencies:
requires.reverse() dependencies.append(duplicate)
return requires return dependencies
def remove_dbs(requires):
'''
Remove double dependencies
'''
dependencies = []
for duplicate in requires:
if duplicate not in dependencies:
dependencies.append(duplicate)
return dependencies
def installing_data(dependencies, support): def installing_data(dependencies, support):
@ -372,11 +370,12 @@ def reference(*args):
template(78) template(78)
def write_deps(name, dependencies): def write_deps(dependencies):
''' '''
Write dependencies in a log file Write dependencies in a log file
into directory `/var/log/slpkg/dep/` into directory `/var/log/slpkg/dep/`
''' '''
name = dependencies[-1]
if find_package(name + sp, pkg_path): if find_package(name + sp, pkg_path):
dep_path = log_path + "dep/" dep_path = log_path + "dep/"
if not os.path.exists(log_path): if not os.path.exists(log_path):