From 369c6baeb50f7625a67f10d536ebac0d56d6f8d0 Mon Sep 17 00:00:00 2001 From: Arcadiy Ivanov Date: Fri, 30 Jun 2023 21:19:13 -0400 Subject: [PATCH] Will now copy both source files and patch files declared in the spec Also fix some spelling errors fixes #463 --- src/tito/builder/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tito/builder/main.py b/src/tito/builder/main.py index ffaa832b..1033fa52 100644 --- a/src/tito/builder/main.py +++ b/src/tito/builder/main.py @@ -527,14 +527,14 @@ def _download_one_source(self, source): self.sources.append(target) def _copy_extra_sources(self, download_sources=False): - cmd = "spectool -S '%s' --define '_sourcedir %s' 2> /dev/null | awk '{print $2}'"\ + cmd = "spectool -S -P '%s' --define '_sourcedir %s' 2> /dev/null | awk '{print $2}'"\ % (self.spec_file, self.start_dir) sources = getoutput(cmd).split("\n") for source in sources[1:]: dst_file = os.path.join(self.rpmbuild_sourcedir, source) if os.path.isfile(dst_file): - debug('Source file "%s" already exists. Skiping.' % dst_file) + debug('Source file "%s" already exists. Skipping.' % dst_file) continue parse = urlparse(source) @@ -550,11 +550,11 @@ def _copy_extra_sources(self, download_sources=False): if self.fetch_sources and download_sources: self._download_one_source(source) continue - debug('Source "%s" is not a local file. Skiping.' % source) + debug('Source "%s" is not a local file. Skipping.' % source) continue if not os.path.exists(source): - debug('Source "%s" file does not exist. Skiping.' % source) + debug('Source "%s" file does not exist. Skipping.' % source) continue src = os.path.join(self.rpmbuild_sourcedir, self.tgz_dir, source)