Re: Proposed fix for long-standing +CONTENTS bug

[Jonathan Perkin <jperkin%joyent.com@localhost>]

* On 2020-04-22 at 13:49 BST, Jonathan Perkin wrote:

> * On 2020-04-22 at 13:34 BST, Greg Troxel wrote:
> 
> > As a thought experiment, rather than a proposal, would issuing
> > "pkg_admin rebuild-tree" after every "pkg_add -DU" avoid problems?
> 
> Yeh, perhaps the brute force method might just be the simplest and
> least likely to cause problems.

FWIW, it seems that even "pkg_admin rebuild-tree" has some bugs.  I
performed a 2019Q4->trunk upgrade with 350 packages installed that
contained some of the trickier dependency matches.

Afterwards I ran rebuild-tree and compared the +REQUIRED_BY files
(after sorting them to reduce noise).  Whilst some entries were fixed,
for example:

  --- nethack-x11-3.6.5/+REQUIRED_BY	Wed Apr 22 13:40:22 2020
  +++ nethack-x11-3.6.5/+REQUIRED_BY	Wed Apr 22 13:41:00 2020
  @@ -1,2 +1,1 @@
  -nethack-all-3.6.4
   nethack-all-3.6.5

  --- subversion-base-1.13.0nb1/+REQUIRED_BY	Wed Apr 22 13:40:24 2020
  +++ subversion-base-1.13.0nb1/+REQUIRED_BY	Wed Apr 22 13:41:01 2020
  @@ -2,5 +2,4 @@
   p5-subversion-1.13.0nb1
   py37-subversion-1.13.0nb1
   ruby26-subversion-1.13.0nb1
  -subversion-1.12.0nb1
   subversion-1.13.0

  --- vim-share-8.2.0303/+REQUIRED_BY	Wed Apr 22 13:40:24 2020
  +++ vim-share-8.2.0303/+REQUIRED_BY	Wed Apr 22 13:41:01 2020
  @@ -1,2 +1,1 @@
  -vim-gtk2-8.1.2200
   vim-gtk2-8.2.0303nb3

there were also now some that had duplicates _added_:

  --- llvm-10.0.0/+REQUIRED_BY	Wed Apr 22 13:40:22 2020
  +++ llvm-10.0.0/+REQUIRED_BY	Wed Apr 22 13:40:59 2020
  @@ -1,5 +1,7 @@
   clang-10.0.0
  +clang-10.0.0
   clang-static-analyzer-10.0.0
  +clang-static-analyzer-10.0.0
   compiler-rt-10.0.0
   libcxx-10.0.0
   libcxxabi-10.0.0

  --- php74-pdo-7.4.5/+REQUIRED_BY	Wed Apr 22 13:40:23 2020
  +++ php74-pdo-7.4.5/+REQUIRED_BY	Wed Apr 22 13:41:01 2020
  @@ -1,5 +1,9 @@
   php74-extensions-7.4.5
   php74-pdo_dblib-7.4.5nb3
  +php74-pdo_dblib-7.4.5nb3
   php74-pdo_mysql-7.4.5
  +php74-pdo_mysql-7.4.5
   php74-pdo_pgsql10-7.4.5
  +php74-pdo_pgsql10-7.4.5
  +php74-pdo_sqlite-7.4.5nb3
   php74-pdo_sqlite-7.4.5nb3

  --- poppler-0.87.0/+REQUIRED_BY	Wed Apr 22 13:40:23 2020
  +++ poppler-0.87.0/+REQUIRED_BY	Wed Apr 22 13:41:01 2020
  @@ -1,2 +1,3 @@
   poppler-glib-0.87.0
  +poppler-glib-0.87.0
   web2c-2019nb6

Now, as they are identical then pkg_delete's remove_line() will ensure
any duplicates are all removed, but it's still not ideal and could
confuse other tools.

I'll take a look at this too.

-- 
Jonathan Perkin  -  Joyent, Inc.  -  www.joyent.com