[rpms/rpkg] 1.70-1: Patch: Skip 'sources' file when it is missing

[rpms/rpkg] 1.70-1: Patch: Skip 'sources' file when it is missing

[@ 2026-08-10 21:44 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : f6188c92dfb8f37e6a5677d6ad6d1c07f16f75b1
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2020-08-31T15:32:43+00:00
            Stats  : +39/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/f6188c92dfb8f37e6a5677d6ad6d1c07f16f75b1?branch=1.70-1

            Log:
            Patch: Skip 'sources' file when it is missing

Signed-off-by: Ondřej Nosek <onosek@redhat.com>

---
diff --git a/0006-Skip-sources-file-when-it-is-missing.patch b/0006-Skip-sources-file-when-it-is-missing.patch
new file mode 100644
index 0000000..0e7cde9
--- /dev/null
+++ b/0006-Skip-sources-file-when-it-is-missing.patch
@@ -0,0 +1,34 @@
+From 3af55c08f4563b4404c509abf5402e30c9c58bda Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nosek?= <onosek@redhat.com>
+Date: Wed, 12 Aug 2020 00:42:25 +0000
+Subject: [PATCH] Skip 'sources' file when it is missing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+JIRA: RHELCMP-1968
+Resolves: rhbz#1867440
+Resolves: rhbz#1869848
+
+Signed-off-by: Ondřej Nosek <onosek@redhat.com>
+---
+ pyrpkg/layout/layouts.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/pyrpkg/layout/layouts.py b/pyrpkg/layout/layouts.py
+index 7324708..fe91b8c 100644
+--- a/pyrpkg/layout/layouts.py
++++ b/pyrpkg/layout/layouts.py
+@@ -42,8 +42,7 @@ class DistGitLayout(BaseLayout):
+ 
+         if len([f for f in os.listdir(path) if f.endswith('.spec')]) == 0:
+             raise LayoutError('spec file not found.')
+-        sources = 'sources' if os.path.exists('%s/sources' % path) else None
+-        return cls(root_dir=path, sources_file_template=sources)
++        return cls(root_dir=path)
+ 
+ 
+ class SRPMLayout(BaseLayout):
+-- 
+2.26.2
+

diff --git a/rpkg.spec b/rpkg.spec
index 073f898..a4767ac 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
 Name:           rpkg
 Version:        1.60
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        Python library for interacting with rpm+git
 License:        GPLv2+ and LGPLv2
@@ -22,6 +22,7 @@ Patch2:         0002-Repair-compatible-formatting-for-Python-2.6.patch
 Patch3:         0003-Switch-from-krb_login-to-gssapi_login.patch
 Patch4:         0004-added-a-extendable-layout-module-to-deal-with-differ.patch
 Patch5:         0005-clog-tests-workaround.patch
+Patch6:         0006-Skip-sources-file-when-it-is-missing.patch
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 # Disable python2 build by default
@@ -273,6 +274,9 @@ nosetests tests
 
 
 %changelog
+* Mon Aug 31 2020 Ondřej Nosek <onosek@redhat.com> - 1.60-8
+- Patch: Skip 'sources' file when it is missing
+
 * Fri Aug 07 2020 Ondřej Nosek <onosek@redhat.com> - 1.60-7
 - Patch: added layout module to deal with different package layouts
 - Patch: clog tests workaround