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

Fixed dependencies order

Browse source
This commit is contained in:
Dimitris Zlatanidis 2022-12-17 21:04:01 +02:00
parent 52bac3057d
commit cbd03a4a98
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
slpkg/slackbuild.py
View file

@ -50,6 +50,25 @@ class Slackbuilds:
for sbo in self.slackbuilds: for sbo in self.slackbuilds:
self.sbos[sbo] = Requires(sbo).resolve() self.sbos[sbo] = Requires(sbo).resolve()
def creating_dependencies_for_build(self):
""" List with the dependencies. """
for deps in self.sbos.values():
for dep in deps:
# Checks if the package was installed and skipped.
if ('--skip-installed' in self.flags and
self.utils.is_installed(dep)):
continue
if dep in self.slackbuilds:
self.slackbuilds.remove(dep)
self.dependencies.append(dep)
# Remove duplicate packages and keeps the order.
self.dependencies = list(OrderedDict.fromkeys(self.dependencies))
self.install_order.extend(self.dependencies)
def creating_main_for_build(self): def creating_main_for_build(self):
""" List with the main slackbuilds. """ """ List with the main slackbuilds. """
[self.install_order.append(main) for main in self.sbos.keys()] [self.install_order.append(main) for main in self.sbos.keys()]
@ -67,22 +86,6 @@ class Slackbuilds:
view.question() view.question()
def creating_dependencies_for_build(self):
""" List with the dependencies. """
for deps in self.sbos.values():
for dep in deps:
# Checks if the package was installed and skipped.
if ('--skip-installed' in self.flags and
self.utils.is_installed(dep)):
continue
if dep not in self.sbos.values() and dep not in self.sbos.keys():
self.dependencies.append(dep)
# Remove duplicate packages and keeps the order.
self.dependencies = list(OrderedDict.fromkeys(self.dependencies))
self.install_order.extend(self.dependencies)
def download_slackbuilds_and_build(self): def download_slackbuilds_and_build(self):
""" Downloads files and sources and starting the build. """ """ Downloads files and sources and starting the build. """
wget = Wget() wget = Wget()