[kernel] r17034 - in dists/trunk: firmware-free/debian/bin firmware-nonfree/debian/bin

[Ben Hutchings]

Author: benh
Date: Wed Mar  9 04:56:25 2011
New Revision: 17034

Log:
Make check_upstream.py get package/subdirectory names from config

Modified:
   dists/trunk/firmware-free/debian/bin/check_upstream.py
   dists/trunk/firmware-nonfree/debian/bin/check_upstream.py

Modified: dists/trunk/firmware-free/debian/bin/check_upstream.py
==============================================================================
--- dists/trunk/firmware-free/debian/bin/check_upstream.py	Wed Mar  9 04:17:01 2011	(r17033)
+++ dists/trunk/firmware-free/debian/bin/check_upstream.py	Wed Mar  9 04:56:25 2011	(r17034)
@@ -7,8 +7,13 @@
 sys.path.append('/usr/share/linux-support-%s/lib/python' %
                 rules_defs['KERNELVERSION'])
 from debian_linux.firmware import FirmwareWhence
+from debian_linux.config import ConfigParser, SchemaItemList
+
+def main(source_dir):
+    config = ConfigParser({'base': {'packages': SchemaItemList()}})
+    config.read('defines')
+    dest_dirs = config['base',]['packages']
 
-def main(source_dir, dest_dirs):
     for section in FirmwareWhence(open(os.path.join(source_dir, 'WHENCE'))):
         if re.search(r'^BSD\b'
                      r'|^GPLv2 or OpenIB\.org BSD\b'
@@ -43,14 +48,12 @@
     print '%s: could be added' % filename
 
 if __name__ == '__main__':
-    if len(sys.argv) < 3:
+    if len(sys.argv) != 2:
         print >>sys.stderr, '''\
-Usage: %s <linux-firmware-dir> <dest-dir>...
+Usage: %s <linux-firmware-dir>
 
 Report changes or additions in linux-firmware.git that may be suitable
 for inclusion in firmware-free.
-
-Specify the per-package subdirectories as <dest-dir>...
 ''' % sys.argv[0]
         sys.exit(2)
-    main(sys.argv[1], sys.argv[2:])
+    main(sys.argv[1])

Modified: dists/trunk/firmware-nonfree/debian/bin/check_upstream.py
==============================================================================
--- dists/trunk/firmware-nonfree/debian/bin/check_upstream.py	Wed Mar  9 04:17:01 2011	(r17033)
+++ dists/trunk/firmware-nonfree/debian/bin/check_upstream.py	Wed Mar  9 04:56:25 2011	(r17034)
@@ -7,8 +7,13 @@
 sys.path.append('/usr/share/linux-support-%s/lib/python' %
                 rules_defs['KERNELVERSION'])
 from debian_linux.firmware import FirmwareWhence
+from debian_linux.config import ConfigParser, SchemaItemList
+
+def main(source_dir):
+    config = ConfigParser({'base': {'packages': SchemaItemList()}})
+    config.read('defines')
+    dest_dirs = config['base',]['packages']
 
-def main(source_dir, dest_dirs):
     for section in FirmwareWhence(open(os.path.join(source_dir, 'WHENCE'))):
         if re.search(r'^BSD\b'
                      r'|^GPLv2 or OpenIB\.org BSD\b'
@@ -54,14 +59,12 @@
     print '%s: could be added' % filename
 
 if __name__ == '__main__':
-    if len(sys.argv) < 3:
+    if len(sys.argv) != 2:
         print >>sys.stderr, '''\
-Usage: %s <linux-firmware-dir> <dest-dir>...
+Usage: %s <linux-firmware-dir>
 
 Report changes or additions in linux-firmware.git that may be suitable
 for inclusion in firmware-nonfree.
-
-Specify the per-package subdirectories as <dest-dir>...
 ''' % sys.argv[0]
         sys.exit(2)
-    main(sys.argv[1], sys.argv[2:])
+    main(sys.argv[1])