diff options
| author | Erik M. Bray <embray@stsci.edu> | 2013-03-05 09:57:37 -0500 |
|---|---|---|
| committer | Erik M. Bray <embray@stsci.edu> | 2013-03-05 09:57:37 -0500 |
| commit | 45ed5ce389e14f3963e1d0cdecbb4ef347e0ff1e (patch) | |
| tree | 4a129666e02cd915c950ddbdc77c7b8f7fa391cd | |
| parent | 738616c4a87cf372614f53d2d942c50e3d6ab60f (diff) | |
| download | pbr-45ed5ce389e14f3963e1d0cdecbb4ef347e0ff1e.tar.gz | |
Somehow neglected to include extra-file.txt used in the test for #15. Also moved the info log message that was causing othere tests to fail to only appear when commands are run that actually affect the manifest generation
| -rw-r--r-- | pbr/d2to1/tests/testpackage/extra-file.txt | 0 | ||||
| -rw-r--r-- | pbr/d2to1/tests/testpackage/setup.cfg | 5 | ||||
| -rw-r--r-- | pbr/d2to1/util.py | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/pbr/d2to1/tests/testpackage/extra-file.txt b/pbr/d2to1/tests/testpackage/extra-file.txt new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/pbr/d2to1/tests/testpackage/extra-file.txt diff --git a/pbr/d2to1/tests/testpackage/setup.cfg b/pbr/d2to1/tests/testpackage/setup.cfg index 310cf81..a200616 100644 --- a/pbr/d2to1/tests/testpackage/setup.cfg +++ b/pbr/d2to1/tests/testpackage/setup.cfg @@ -27,8 +27,9 @@ keywords = packaging, distutils, setuptools [files] packages = d2to1_testpackage -package_data = testpackage = package_data/*.txt -data_files = testpackage/data_files = data_files/*.txt +package-data = testpackage = package_data/*.txt +data-files = testpackage/data_files = data_files/*.txt +extra-files = extra-file.txt [extension=d2to1_testpackage.testext] sources = src/testext.c diff --git a/pbr/d2to1/util.py b/pbr/d2to1/util.py index d717448..51ba2b2 100644 --- a/pbr/d2to1/util.py +++ b/pbr/d2to1/util.py @@ -205,10 +205,10 @@ def cfg_to_args(path='setup.cfg'): 'exist' % filename) # Unfortunately the only really sensible way to do this is to # monkey-patch the manifest_maker class - log.info('patching the manifest_maker command to add extra_files ' - 'support') @monkeypatch_method(manifest_maker) def add_defaults(self, extra_files=extra_files): + log.info('[d2to1] running patched manifest_maker command with ' + 'extra_files support') add_defaults._orig(self) self.filelist.extend(extra_files) |