- deal with noarch subpackages

Changed files:
    modules/ftptree.py -> 1.60

diff --git a/modules/ftptree.py b/modules/ftptree.py
index b3a09da152bc2e02bb39b548dcd40874697a2b47..d0224b6f3cd4fd8767a2eba67373a9be8b526df8 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -436,9 +436,16 @@ class FtpTree(BaseFtpTree):
                     pkg.error('moving would remove archs: %s' % self.__arch_stringify(missingarchs))
             else:
                 # warn if a package isn't built for all archs
-                if (config.separate_noarch and 'noarch' in pkg.files.keys() and len(pkg.files.keys()) == 2):
-                    continue
-                elif len(pkg.files.keys()) != len(config.ftp_archs) + 1:
+                # ftp_archs + SRPMS
+                ftp_archs_num = len(config.ftp_archs) + 1
+                if (config.separate_noarch and 'noarch' in pkg.files.keys()):
+                    # ftp_archs + SRPMS + noarch subpackages
+                    ftp_archs_num += 1
+                    # plain simple noarch package
+                    if (len(pkg.files.keys()) == 2):
+                        continue
+
+                if len(pkg.files.keys()) != ftp_archs_num:
                     missingarchs = []
                     for arch in config.ftp_archs:
                         if arch not in pkg.files.keys():