Commit 0384d64
Fix regression with system package manager tools (#18872)
* package_manager (Apt): Fix check_command for all packages
The current `check_command` for Apt at foreign architectures checks
for `<package_name:<arch>`.
However, this selector doesn't find all packages.
The solution is to just check for the package name,
dpkg-query will list the architecures and we check for the correct one.
Docs: omit
Close #18569
* package_manager (Apt): Fix check_command for multiple matches
When `dpkg-query` finds multiple matches, it printed that on the same line,
which broke the grep.
Close #18862
* pass base_name
* fix tests
* Conan 2.20.1
* Update conan/tools/system/package_manager.py
* fix potential issue with \n using raw strings
---------
Co-authored-by: Alexander Krabler <alexander.krabler@kuka.com>1 parent 6960af2 commit 0384d64
3 files changed
Lines changed: 10 additions & 8 deletions
File tree
- conan
- tools/system
- test/integration/tools/system
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
233 | 233 | | |
234 | 234 | | |
235 | 235 | | |
236 | | - | |
| 236 | + | |
| 237 | + | |
237 | 238 | | |
238 | 239 | | |
239 | | - | |
| 240 | + | |
| 241 | + | |
240 | 242 | | |
241 | 243 | | |
242 | 244 | | |
| |||
250 | 252 | | |
251 | 253 | | |
252 | 254 | | |
253 | | - | |
254 | | - | |
| 255 | + | |
| 256 | + | |
255 | 257 | | |
256 | 258 | | |
257 | 259 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
427 | 427 | | |
428 | 428 | | |
429 | 429 | | |
430 | | - | |
| 430 | + | |
431 | 431 | | |
432 | 432 | | |
433 | 433 | | |
| |||
451 | 451 | | |
452 | 452 | | |
453 | 453 | | |
454 | | - | |
| 454 | + | |
455 | 455 | | |
456 | 456 | | |
457 | 457 | | |
| |||
470 | 470 | | |
471 | 471 | | |
472 | 472 | | |
473 | | - | |
| 473 | + | |
0 commit comments