| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 1 | From 4acda6d01c5abd33f1a1a3275fd695363f59473f Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Stewart <alex.stewart@ni.com> |
| 3 | Date: Tue, 15 Dec 2020 15:17:54 -0600 |
| 4 | Subject: [opkg][opkg-0.4.4 PATCH] tests: let the OS negotiate relative package |
| 5 | dirs |
| 6 | |
| 7 | In cases where a regression test requires that a package be installed to |
| 8 | a subdirectory in the test feed, the opk.py module will attempt to |
| 9 | resolve the subdirectory and rebase it to the root of the test feed. |
| 10 | |
| 11 | This is unnecessary, since all operations which make use of the |
| 12 | subdirectory path do so from the perspective of the test feed already. |
| 13 | Further, the rebase implementation breaks in cases where the test feed |
| 14 | is beyond a symlink. |
| 15 | |
| 16 | Remove the resolve-and-rebase logic, and allow the OS to negotiate the |
| 17 | relative path. |
| 18 | |
| 19 | Upstream-Status: Submitted [https://groups.google.com/g/opkg-devel/c/dE1o7_OVQSY] |
| 20 | |
| 21 | Signed-off-by: Alex Stewart <alex.stewart@ni.com> |
| 22 | --- |
| 23 | tests/opk.py | 4 +--- |
| 24 | 1 file changed, 1 insertion(+), 3 deletions(-) |
| 25 | |
| 26 | diff --git a/tests/opk.py b/tests/opk.py |
| 27 | index 692339567f72441766c8e658edc5bdf6a339f77d..711abacaeb328283e31524f6a49305fc7d39696a 100644 |
| 28 | --- a/tests/opk.py |
| 29 | +++ b/tests/opk.py |
| 30 | @@ -58,9 +58,7 @@ class Opk: |
| 31 | if 'Version' not in control.keys(): |
| 32 | control['Version'] = '1.0' |
| 33 | if subdirectory is not None: |
| 34 | - subdir = Path(subdirectory).resolve() |
| 35 | - opkdir = Path(cfg.opkdir) |
| 36 | - self._relative_dir = subdir.relative_to(opkdir) |
| 37 | + self._relative_dir = Path(subdirectory) |
| 38 | else: |
| 39 | self._relative_dir = None |
| 40 | self.control = control |
| 41 | -- |
| 42 | 2.29.2 |
| 43 | |