diff --git a/slpkg/slackbuild.py b/slpkg/slackbuild.py index 9cd09374..e50489d1 100644 --- a/slpkg/slackbuild.py +++ b/slpkg/slackbuild.py @@ -50,6 +50,25 @@ class Slackbuilds: for sbo in self.slackbuilds: 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): """ List with the main slackbuilds. """ [self.install_order.append(main) for main in self.sbos.keys()] @@ -67,22 +86,6 @@ class Slackbuilds: 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): """ Downloads files and sources and starting the build. """ wget = Wget()