[projects/pld-ftp-admin] Support for split debugsource packaes

baggins baggins at pld-linux.org
Wed Mar 24 09:54:42 CET 2021


commit 20313fadc236914a74cf8cd5f1e42fcc451a3e2a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Mar 24 09:54:24 2021 +0100

    Support for split debugsource packaes

 bin/pfa-from-incoming       | 2 +-
 modules/ftptree.py          | 2 +-
 wwwbin/checkrepo.sh         | 2 +-
 wwwbin/consistency-check.sh | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/bin/pfa-from-incoming b/bin/pfa-from-incoming
index f86a73f..e4def7a 100755
--- a/bin/pfa-from-incoming
+++ b/bin/pfa-from-incoming
@@ -29,7 +29,7 @@ def is_debuginfo(nvr):
     if not config.separate_debuginfo:
         return False
     pkg = nvr.split('-')[:-2]
-    return pkg[-1] == 'debuginfo'
+    return pkg[-1] == 'debuginfo' or pkg[-1] == 'debugsource'
 
 def findfiles(dir):
     def filterinfos(x):
diff --git a/modules/ftptree.py b/modules/ftptree.py
index 2c09a69..7d841a8 100644
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -99,7 +99,7 @@ class Pkg(BasePkg):
         if not config.separate_debuginfo:
             return False
         pkg = nvr.split('-')[:-2]
-        return pkg[-1] == 'debuginfo'
+        return pkg[-1] == 'debuginfo' or pkg[-1] == 'debugsource'
 
     def is_sourcefile(self, file):
         """
diff --git a/wwwbin/checkrepo.sh b/wwwbin/checkrepo.sh
index db2cff1..6573a2a 100755
--- a/wwwbin/checkrepo.sh
+++ b/wwwbin/checkrepo.sh
@@ -7,7 +7,7 @@ REPODIR=${1:-/home/pld/admins/th/ftp/test}
 expand_info() {
 	awk -F ':' -vD="$REPODIR/" '
 		/file:/ {
-			if (/-debuginfo-/) {
+			if (/-debug(info|source)-/) {
 				print D $2 "/debuginfo/" $3
 			} else {
 				print D $2 "/RPMS/" $3
diff --git a/wwwbin/consistency-check.sh b/wwwbin/consistency-check.sh
index ad90590..d12d1a3 100755
--- a/wwwbin/consistency-check.sh
+++ b/wwwbin/consistency-check.sh
@@ -59,6 +59,7 @@ gen_list() {
 	poldek \
 	 -O "auto directory dependencies = yes" \
 	--ignore "*-debuginfo-*" \
+	--ignore "*-debugsource-*" \
 	--ignore "opera-plugin32-*" \
 	--ignore "nspluginwrapper-*" \
 	--ignore "mbrola-voice-*" \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-ftp-admin.git/commitdiff/20313fadc236914a74cf8cd5f1e42fcc451a3e2a



More information about the pld-cvs-commit mailing list