| kparal | |
| tflink |
Depcheck now accepts workdir parameter. If that is provided, it uses it. Othervise depcheck creates custom tmpdir
Tested locally with runtask.py
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | depcheck.yml (2 lines) | |||
| M | depcheck/__init__.py (9 lines) | |||
| M | run_depcheck.py (4 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 58fbe2e2d317 | 59e7b5f88eba | 3b8bde5c9910 | Josef Skladanka | Depcheck should not create its own tmpdir (Show More…) | Jun 26 2014, 11:51 AM |
| Show All 37 Lines | 37 | python: | |||
|---|---|---|---|---|---|
| 38 | file: run_depcheck.py | 38 | file: run_depcheck.py | ||
| 39 | callable: taskotron_run | 39 | callable: taskotron_run | ||
| 40 | arch: ['i386'] | 40 | arch: ['i386'] | ||
| 41 | rpms: ["${workdir}/downloaded_tag/"] | 41 | rpms: ["${workdir}/downloaded_tag/"] | ||
| 42 | repos: | 42 | repos: | ||
| 43 | - ${yumrepos_i386} | 43 | - ${yumrepos_i386} | ||
| 44 | - "workdir_repo": "${workdir}/downloaded_tag/" | 44 | - "workdir_repo": "${workdir}/downloaded_tag/" | ||
| 45 | report_format: "updates" | 45 | report_format: "updates" | ||
| 46 | workdir: "${workdir}" | ||||
| 46 | export: depcheck_output_i386 | 47 | export: depcheck_output_i386 | ||
| 47 | 48 | | |||
| 48 | - name: download koji tag | 49 | - name: download koji tag | ||
| 49 | koji: | 50 | koji: | ||
| 50 | action: download_tag | 51 | action: download_tag | ||
| 51 | koji_tag: ${koji_tag} | 52 | koji_tag: ${koji_tag} | ||
| 52 | arch: ['x86_64'] | 53 | arch: ['x86_64'] | ||
| 53 | target_dir: "${workdir}/downloaded_tag/" | 54 | target_dir: "${workdir}/downloaded_tag/" | ||
| Show All 16 Lines | 70 | python: | |||
| 70 | file: run_depcheck.py | 71 | file: run_depcheck.py | ||
| 71 | callable: taskotron_run | 72 | callable: taskotron_run | ||
| 72 | arch: ['x86_64'] | 73 | arch: ['x86_64'] | ||
| 73 | rpms: ["${workdir}/downloaded_tag/"] | 74 | rpms: ["${workdir}/downloaded_tag/"] | ||
| 74 | repos: | 75 | repos: | ||
| 75 | - ${yumrepos_x86_64} | 76 | - ${yumrepos_x86_64} | ||
| 76 | - "workdir_repo": "${workdir}/downloaded_tag/" | 77 | - "workdir_repo": "${workdir}/downloaded_tag/" | ||
| 77 | report_format: "updates" | 78 | report_format: "updates" | ||
| 79 | workdir: "${workdir}" | ||||
| 78 | export: depcheck_output_x86_64 | 80 | export: depcheck_output_x86_64 | ||
| 79 | 81 | | |||
| 80 | 82 | | |||
| 81 | # Report Results | 83 | # Report Results | ||
| 82 | - name: report i386 results to resultsdb | 84 | - name: report i386 results to resultsdb | ||
| 83 | resultsdb: | 85 | resultsdb: | ||
| 84 | results: ${depcheck_output_i386} | 86 | results: ${depcheck_output_i386} | ||
| 85 | 87 | | |||
| Show All 17 Lines | |||||
| Show First 20 Lines • Show All 57 Lines • ▼ Show 20 Line(s) | 57 | if filename.endswith('.rpm'): | |||
|---|---|---|---|---|---|
| 58 | rpm_list.append(os.path.join(dirname, filename)) | 58 | rpm_list.append(os.path.join(dirname, filename)) | ||
| 59 | return rpm_list | 59 | return rpm_list | ||
| 60 | 60 | | |||
| 61 | 61 | | |||
| 62 | def extract_named_repo(namedrepo): | 62 | def extract_named_repo(namedrepo): | ||
| 63 | return namedrepo.split(':', 1) | 63 | return namedrepo.split(':', 1) | ||
| 64 | 64 | | |||
| 65 | 65 | | |||
| 66 | def run(rpms, arch, repos, report_format="rpms"): | 66 | def run(rpms, arch, repos, report_format="rpms", workdir=None): | ||
| 67 | """ | 67 | """ | ||
| 68 | report_format: rpms, updates | 68 | report_format: rpms, updates | ||
| 69 | """ | 69 | """ | ||
| 70 | 70 | | |||
| 71 | # handle directory args, expanding them to a list of rpm files with absolute | 71 | # handle directory args, expanding them to a list of rpm files with absolute | ||
| 72 | # paths | 72 | # paths | ||
| 73 | if isinstance(rpms, basestring): | 73 | if isinstance(rpms, basestring): | ||
| 74 | rpms = [rpms] | 74 | rpms = [rpms] | ||
| Show All 17 Lines | |||||
| 92 | if arch == 'i386': | 92 | if arch == 'i386': | ||
| 93 | arch = 'i686' | 93 | arch = 'i686' | ||
| 94 | 94 | | |||
| 95 | # handle data formatting for repo metadata (list of dicts) | 95 | # handle data formatting for repo metadata (list of dicts) | ||
| 96 | handled_repos = {} | 96 | handled_repos = {} | ||
| 97 | for repo, path in repos.items(): | 97 | for repo, path in repos.items(): | ||
| 98 | handled_repos[repo] = {'arch': arch, 'path': path} | 98 | handled_repos[repo] = {'arch': arch, 'path': path} | ||
| 99 | 99 | | |||
| 100 | workdir = tempfile.mkdtemp('', 'depcheck-', '/var/tmp/') | 100 | if workdir is None: | ||
| 101 | workdir = tempfile.mkdtemp('', 'depcheck-', '/var/tmp/') | ||||
| 102 | else: | ||||
| 103 | workdir = os.path.join(workdir, 'depcheck_workdir') | ||||
| 104 | os.makedirs(workdir) | ||||
| 105 | | ||||
| 101 | md_handle = metadata.DepcheckMetadata(handled_repos, targetdir=workdir) | 106 | md_handle = metadata.DepcheckMetadata(handled_repos, targetdir=workdir) | ||
| 102 | 107 | | |||
| 103 | repomd_files = md_handle.repodata | 108 | repomd_files = md_handle.repodata | ||
| 104 | 109 | | |||
| 105 | output = None | 110 | output = None | ||
| 106 | 111 | | |||
| 107 | depck = depcheck.Depcheck(str(arch), repomd_files, workdir=workdir) | 112 | depck = depcheck.Depcheck(str(arch), repomd_files, workdir=workdir) | ||
| 108 | run_result = depck.check_rpm_deps(rpmlist) | 113 | run_result = depck.check_rpm_deps(rpmlist) | ||
| ▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines | |||||
| 1 | #!/usr/bin/python | 1 | #!/usr/bin/python | ||
|---|---|---|---|---|---|
| 2 | 2 | | |||
| 3 | import sys | 3 | import sys | ||
| 4 | import os | 4 | import os | ||
| 5 | 5 | | |||
| 6 | sys.path.insert(0, os.path.realpath(os.path.dirname(__file__))) | 6 | sys.path.insert(0, os.path.realpath(os.path.dirname(__file__))) | ||
| 7 | 7 | | |||
| 8 | import depcheck | 8 | import depcheck | ||
| 9 | from depcheck import exc | 9 | from depcheck import exc | ||
| 10 | 10 | | |||
| 11 | def taskotron_run(rpms, arch, repos, report_format): | 11 | def taskotron_run(rpms, arch, repos, report_format, workdir=None): | ||
| 12 | """ | 12 | """ | ||
| 13 | rpms: list of rpm files and/or directories containing rpm files | 13 | rpms: list of rpm files and/or directories containing rpm files | ||
| 14 | arch: list of arches that can contain just one 'primary' arch | 14 | arch: list of arches that can contain just one 'primary' arch | ||
| 15 | repos: dictionary or list of dictionaries | 15 | repos: dictionary or list of dictionaries | ||
| 16 | report_format: "rpms" or "updates" | 16 | report_format: "rpms" or "updates" | ||
| 17 | """ | 17 | """ | ||
| 18 | 18 | | |||
| 19 | # FIXME: do something saner in the future - nasty fix for the moment | 19 | # FIXME: do something saner in the future - nasty fix for the moment | ||
| Show All 17 Lines | 34 | for name, url in repo.items(): | |||
| 37 | repositories[name] = url | 37 | repositories[name] = url | ||
| 38 | 38 | | |||
| 39 | elif isinstance(repos, dict): | 39 | elif isinstance(repos, dict): | ||
| 40 | repositories = repos | 40 | repositories = repos | ||
| 41 | 41 | | |||
| 42 | else: | 42 | else: | ||
| 43 | raise exc.DepcheckException('Unsupported type of repos arg') | 43 | raise exc.DepcheckException('Unsupported type of repos arg') | ||
| 44 | 44 | | |||
| 45 | return depcheck.run(rpms, arch, repositories, report_format) | 45 | return depcheck.run(rpms, arch, repositories, report_format, workdir) | ||
| 46 | 46 | | |||
| 47 | if __name__ == '__main__': | 47 | if __name__ == '__main__': | ||
| 48 | depcheck.depcheck_cli() | 48 | depcheck.depcheck_cli() | ||