Support for split debugsource packaes

diff --git a/bin/pfa-from-incoming b/bin/pfa-from-incoming
index f86a73f52dab1312d839def7f96ae50d62dfe082..e4def7a2752537ca5a35aa149ca1a12bfef98e06 100755 (executable)
--- 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 2c09a69d74e890728ff5d8efff30184a57e8c3d2..7d841a823631a2b66ae1dcde2fa05bcbc5dd474c 100644 (file)
--- 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 db2cff1bc34739323513d2f7b17956d6fc9964f7..6573a2a346eb9ad29b5b0c70f3005ab244a80439 100755 (executable)
--- 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 ad9059062236fec5a41887b964d71d2acf6aa71f..d12d1a3ec28de7c2fc139d916cd2a2086c4fabae 100755 (executable)
--- 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-*" \