jperkin
commented
3 years ago Thanks for looking at this! I have a few comments:
-
I'd prefer to keep the autoconf changes to a separate commit, and would also like to just hold off on these for a while. We ran into a number of issues in pkgsrc after the bump from 2.69 and I'd like to test it a bit more thoroughly.
-
Unrelated to this fix, but it's confusing that
pkgin searchtakes regular expressions whereaspkgin install/removeetc take globs:
$ pkgin search tiny*db
No results found for tiny*db
$ pkgin search tiny.*db
tinycdb-0.78 Create and read constant databases
$ pkgin install tiny.*db
tiny.*db is not available in the repository
$ pkgin install tiny*db
calculating dependencies...done.
1 package to install:
tinycdb-0.78Not something we should fix as part of this commit but definitely something that needs fixing at some point.
- While the test suite runs clean against this change, I see an abort when testing manually on macOS (we don't yet have any tests for glob stuff in the test suite):
$ pkgin rm tiny*db
1 packages to delete:
tinycdb-0.78
proceed ? [Y/n]
removing tinycdb-0.78...
pkg_install warnings: 0, errors: 0
reading local summary...
processing local summary...
Abort trap: 6 (core dumped)(lldb) thread backtrace
* thread #1, stop reason = signal SIGSTOP
* frame #0: 0x00007fff202e492e libsystem_kernel.dylib`__pthread_kill + 10
frame #1: 0x00007fff203135bd libsystem_pthread.dylib`pthread_kill + 263
frame #2: 0x00007fff20268411 libsystem_c.dylib`abort + 120
frame #3: 0x00007fff201481f5 libsystem_malloc.dylib`malloc_vreport + 548
frame #4: 0x00007fff2014b34a libsystem_malloc.dylib`malloc_report + 151
frame #5: 0x000000010ec800f9 pkgin`free_pkglist_entry(plist=0x00007ffee0f8a1b0) at pkglist.c:96:2
frame #6: 0x000000010ec80481 pkgin`free_global_pkglist(plisthead=0x000000010ec9a050) at pkglist.c:159:3
frame #7: 0x000000010ec8042c pkgin`free_global_pkglists at pkglist.c:167:2
frame #8: 0x000000010ec7d0c6 pkgin`main(argc=2, argv=0x00007ffee0f8a270) at main.c:308:2
frame #9: 0x00007fff2032ef5d libdyld.dylib`start + 1
frame #10: 0x00007fff2032ef5d libdyld.dylib`start + 1
(lldb) frame select 5
frame #5: 0x000000010ec800f9 pkgin`free_pkglist_entry(plist=0x00007ffee0f8a1b0) at pkglist.c:96:2
93 free_pkglist_entry(Pkglist **plist)
94 {
95 XFREE((*plist)->full);
-> 96 XFREE((*plist)->name);
97 XFREE((*plist)->version);
98 XFREE((*plist)->depend);
99 XFREE((*plist)->comment);
(lldb) print (*plist)->full
(char *) $9 = 0x0000000000000000
(lldb) print (*plist)->name
(char *) $10 = 0x00007fcd81ec5890 "\xff\xff\U0000001e\xd8\xfc\a"
(lldb) print (*plist)->version
(char *) $11 = 0x00007fcd81ec58a0 "2.7.4nb11"
(lldb) print (*plist)->depend
(char *) $12 = 0x0000000000000000
(lldb) print (*plist)->comment
(char *) $13 = 0x00007fcd81ec55c0 "Network UPS Tools perl binding"(*plist)->name looks like garbage to me, and the rest doesn't match the package we're operating on but is coming from the unrelated sysutils/p5-UPS-Nut. We should also fix the incorrect plural "1 packages to delete".
iMilnb
This fixes #114 totally. In both
pkgin inandpkgin rm, globs were not expanded, when installing, this forbids a package requested as a glob (i.e.s*ege) to be recorded as "keepable". They were also not expanded when deleting a package, meaningpkgin rm s*egewould not find any package to process.The package list is now modifiable and expanded for further processing.