diff options
| author | Mats Wichmann <mats@linux.com> | 2019-06-25 16:56:43 (GMT) |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2019-12-05 00:33:25 (GMT) |
| commit | d4eaa1986cfffdb11eee0aa5240fa44bef370fb1 (patch) | |
| tree | fe156e17caec56884bff27bf350ee3f38950d5cc /test/packaging/rpm | |
| parent | 714d2c0baf5573c32bf709f3d252496c2359b345 (diff) | |
| download | SCons-d4eaa1986cfffdb11eee0aa5240fa44bef370fb1.zip SCons-d4eaa1986cfffdb11eee0aa5240fa44bef370fb1.tar.gz SCons-d4eaa1986cfffdb11eee0aa5240fa44bef370fb1.tar.bz2 | |
Improve building of docs using Py3 [ci skip]
* context managers on file r/w + use shutil.copy where it makes sense.
* lxml wants (demands?) that xml files be processed as bytes
* for the phase where we gen the entity files, read as text anyway
* Need to solve a problem where the generated xml is putting the \n in
literally, not evaluating it.
* Fix some examples broken for py3
* Fix more octal constant instances
* Cleanups suggested by PyCharm: staticmethods, two blanks
before class definition, others.
This addresses issues called out in #3300, but is not a complete
solution because the actual doc build step still fails with the
epydoc failures (which aren't directly because of Py3; epydoc
build doesn't work any better on my system with Py3, even with
the forked version with patches).
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'test/packaging/rpm')
| -rw-r--r-- | test/packaging/rpm/tagging.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/packaging/rpm/tagging.py b/test/packaging/rpm/tagging.py index c730e14..f02a51b 100644 --- a/test/packaging/rpm/tagging.py +++ b/test/packaging/rpm/tagging.py @@ -62,7 +62,7 @@ env.Append(RPMFLAGS = r' --buildroot %(rpm_build_root)s') install_dir= os.path.join( ARGUMENTS.get('prefix', '/'), 'bin/' ) prog_install = env.Install( install_dir , Program( 'src/main.c' ) ) -env.Tag( prog_install, UNIX_ATTR = '(0755, root, users)' ) +env.Tag( prog_install, UNIX_ATTR = '(0o755, root, users)' ) env.Alias( 'install', prog_install ) env.Package( NAME = 'foo', @@ -94,7 +94,7 @@ with os.popen('rpm -qpl %s' % src_rpm) as p: out = p.read() test.fail_test( not out == 'foo-1.2.3.spec\nfoo-1.2.3.tar.gz\n') -expect = '(0755, root, users) /bin/main' +expect = '(0o755, root, users) /bin/main' test.must_contain_all_lines(test.read('foo-1.2.3.spec',mode='r'), [expect]) test.pass_test() |