|
35 | 35 |
|
36 | 36 | supported_arch_list = supported_arch.strip().split('\n')
|
37 | 37 | supported_version_list = supported_version.strip().split('\n')
|
38 |
| - deb_file_list = deb_file_path.strip().split('\n') |
39 |
| - deb_file_version_list = deb_file_target_version.strip().split('\n') |
| 38 | + deb_file_path = deb_file_path.strip() |
| 39 | + deb_file_version = deb_file_target_version.strip() |
40 | 40 |
|
41 | 41 | logging.debug(supported_arch_list)
|
42 | 42 | logging.debug(supported_version_list)
|
43 |
| - logging.debug(deb_file_list) |
44 |
| - logging.debug(deb_file_version_list) |
| 43 | + logging.debug(deb_file_path) |
| 44 | + logging.debug(deb_file_version) |
45 | 45 |
|
46 |
| - if any( |
47 |
| - (target_version not in supported_version_list) for target_version in deb_file_version_list |
48 |
| - ): |
| 46 | + if deb_file_version not in supported_version_list: |
49 | 47 | logging.error('File version target is not listed in repo supported version list')
|
50 | 48 | sys.exit(1)
|
51 | 49 |
|
|
84 | 82 | 'format_version': 1,
|
85 | 83 | 'sw_version': deb_file_control['Version'],
|
86 | 84 | 'sw_architecture': deb_file_control['Architecture'],
|
87 |
| - 'linux_version': deb_file_target_version |
| 85 | + 'linux_version': deb_file_version |
88 | 86 | }
|
89 | 87 |
|
90 | 88 | current_metadata_str = json.dumps(current_metadata)
|
|
146 | 144 |
|
147 | 145 | logging.info('-- Adding package to repo --')
|
148 | 146 |
|
149 |
| - for deb, target in zip(deb_file_list, deb_file_version_list): |
150 |
| - logging.info('Adding {}'.format(deb)) |
151 |
| - os.system( |
152 |
| - 'reprepro -b {} --export=silent-never includedeb {} {}'.format( |
153 |
| - apt_dir, |
154 |
| - target, |
155 |
| - deb, |
156 |
| - ) |
| 147 | + logging.info('Adding {}'.format(deb_file_path)) |
| 148 | + os.system( |
| 149 | + 'reprepro -b {} --export=silent-never includedeb {} {}'.format( |
| 150 | + apt_dir, |
| 151 | + deb_file_version, |
| 152 | + deb_file_path, |
157 | 153 | )
|
| 154 | + ) |
158 | 155 |
|
159 | 156 | logging.debug('Signing to unlock key on gpg agent')
|
160 | 157 | gpg.sign('test', keyid=private_key_id, passphrase=key_passphrase)
|
|
0 commit comments