pld-ftp-admin: modules/ftptree.py - deal with noarch subpackages
baggins
baggins at pld-linux.org
Wed Nov 7 12:08:13 CET 2012
Author: baggins Date: Wed Nov 7 11:08:13 2012 GMT
Module: pld-ftp-admin Tag: HEAD
---- Log message:
- deal with noarch subpackages
---- Files affected:
pld-ftp-admin/modules:
ftptree.py (1.59 -> 1.60)
---- Diffs:
================================================================
Index: pld-ftp-admin/modules/ftptree.py
diff -u pld-ftp-admin/modules/ftptree.py:1.59 pld-ftp-admin/modules/ftptree.py:1.60
--- pld-ftp-admin/modules/ftptree.py:1.59 Sat Sep 22 22:16:22 2012
+++ pld-ftp-admin/modules/ftptree.py Wed Nov 7 12:08:08 2012
@@ -436,9 +436,16 @@
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():
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pld-ftp-admin/modules/ftptree.py?r1=1.59&r2=1.60
More information about the pld-cvs-commit
mailing list