Minor cleanups for Debian packaging (lintian warnings and errors) #8803
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #8803 +/- ##
==========================================
- Coverage 78.73% 78.71% -0.02%
==========================================
Files 382 382
Lines 117812 117812
==========================================
- Hits 92758 92740 -18
- Misses 25054 25072 +18
Continue to review full report at Codecov.
|
behlendorf
approved these changes
May 24, 2019
loli10K
reviewed
May 26, 2019
| @@ -1,4 +1,4 @@ | |||
| #!/usr/bin/python | |||
| #!/usr/bin/python3 | |||
There was a problem hiding this comment.
This commit changes test-runner.py to also use /usr/bin/python3,
enabling the change during buildtime and fixing a minor lintian issue
on Debian systems, which only have python3 installed.
The highlighted part of the commit message seems to suggest (all) Debian systems don't provide python2. I tested this change on a Debian8 (Python 2.7.9) but the number of lintian warning/errors regarding test-runner.py seems to be the same as the unpatched version:
root@linux:~# lsb_release -a
No LSB modules are available.
Distributor ID: Debian
Description: Debian GNU/Linux 8.0 (jessie)
Release: 8.0
Codename: jessie
root@linux:~# python -V
Python 2.7.9
root@linux:~# grep runner /var/tmp/patched /var/tmp/vanilla
/var/tmp/patched:E: zfs-test: python-script-but-no-python-dep usr/share/zfs/test-runner/bin/test-runner.py
/var/tmp/patched:E: zfs-test: python-script-but-no-python-dep usr/share/zfs/test-runner/bin/zts-report.py
/var/tmp/vanilla:E: zfs-test: python-script-but-no-python-dep usr/share/zfs/test-runner/bin/test-runner.py
/var/tmp/vanilla:E: zfs-test: python-script-but-no-python-dep usr/share/zfs/test-runner/bin/zts-report.py
root@linux:~#
There was a problem hiding this comment.
Thanks for the review and for catching the wrong phrasing of the commit message!
I just pushed a reworded version.
Additionally tested by building zfs while explicitly configuring for python2, and adapting the appropriate fields in the debian/control file - The lintian errors don't appear, and the shebang of test-runner.py is set to /usr/bin/python2
added 2 commits
May 27, 2019 13:34
In commit 6e72a5b python scripts which work with python2 and python3 changed the shebang from /usr/bin/python to /usr/bin/python3. This gets adapted by the build-system on systems which don't provide python3. This commit changes test-runner.py to also use /usr/bin/python3, enabling the change during buildtime and fixing a minor lintian issue for those Debian packages, which depend on a specific python version (python3/python2). Signed-off-by: Stoiko Ivanov <[email protected]>
files in dist_*_SCRIPTS get installed with 0755, those in dist_*_DATA with 0644. This commit moves all .kshlib, .shlib and .cfg files in the testsuite to dist_pkgdata_DATA, and removes the shebang from zpool_import.kshlib. This ensures that the files are installed with appropriate permissions and silences some warnings from lintian Signed-off-by: Stoiko Ivanov <[email protected]>
loli10K
approved these changes
May 27, 2019
jwk404
approved these changes
May 28, 2019
behlendorf
added
Status: Accepted
behlendorf
pushed a commit
that referenced
this pull request
May 28, 2019
files in dist_*_SCRIPTS get installed with 0755, those in dist_*_DATA with 0644. This commit moves all .kshlib, .shlib and .cfg files in the testsuite to dist_pkgdata_DATA, and removes the shebang from zpool_import.kshlib. This ensures that the files are installed with appropriate permissions and silences some warnings from lintian Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: loli10K <[email protected]> Reviewed by: John Kennedy <[email protected]> Signed-off-by: Stoiko Ivanov <[email protected]> Closes #8803
behlendorf
pushed a commit
that referenced
this pull request
Jun 7, 2019
In commit 6e72a5b python scripts which work with python2 and python3 changed the shebang from /usr/bin/python to /usr/bin/python3. This gets adapted by the build-system on systems which don't provide python3. This commit changes test-runner.py to also use /usr/bin/python3, enabling the change during buildtime and fixing a minor lintian issue for those Debian packages, which depend on a specific python version (python3/python2). Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: loli10K <[email protected]> Reviewed by: John Kennedy <[email protected]> Signed-off-by: Stoiko Ivanov <[email protected]> Closes #8803
behlendorf
pushed a commit
that referenced
this pull request
Jun 7, 2019
files in dist_*_SCRIPTS get installed with 0755, those in dist_*_DATA with 0644. This commit moves all .kshlib, .shlib and .cfg files in the testsuite to dist_pkgdata_DATA, and removes the shebang from zpool_import.kshlib. This ensures that the files are installed with appropriate permissions and silences some warnings from lintian Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: loli10K <[email protected]> Reviewed by: John Kennedy <[email protected]> Signed-off-by: Stoiko Ivanov <[email protected]> Closes #8803
allanjude
pushed a commit
to allanjude/zfs
that referenced
this pull request
Jun 7, 2019
files in dist_*_SCRIPTS get installed with 0755, those in dist_*_DATA with 0644. This commit moves all .kshlib, .shlib and .cfg files in the testsuite to dist_pkgdata_DATA, and removes the shebang from zpool_import.kshlib. This ensures that the files are installed with appropriate permissions and silences some warnings from lintian Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: loli10K <[email protected]> Reviewed by: John Kennedy <[email protected]> Signed-off-by: Stoiko Ivanov <[email protected]> Closes openzfs#8803
allanjude
pushed a commit
to allanjude/zfs
that referenced
this pull request
Jun 15, 2019
files in dist_*_SCRIPTS get installed with 0755, those in dist_*_DATA with 0644. This commit moves all .kshlib, .shlib and .cfg files in the testsuite to dist_pkgdata_DATA, and removes the shebang from zpool_import.kshlib. This ensures that the files are installed with appropriate permissions and silences some warnings from lintian Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: loli10K <[email protected]> Reviewed by: John Kennedy <[email protected]> Signed-off-by: Stoiko Ivanov <[email protected]> Closes openzfs#8803
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
The 2 commits fix cosmetic issues I encountered while packaging zfs-0.8.0-rc5 for PVE/Debian.
Description
tests/test-runner/bin/test-runner.pywas changed from/usr/bin/pythonto/usr/bin/python3- the buildsystem replaces this with python2, if it is the version used/found during./configuredist_pkgdata_SCRIPTSwere instead put intodist_pkgdata_DATAin order to be installed 0644 instead of 0755How Has This Been Tested?
make rpm-buildwas run on a fedora 30 installation - once with python3 only installed and once after running./configure --with-python=2- I checked the resulting files in the rpmsTypes of changes
Checklist:
Signed-off-by.