Bug 246336 - Tools/scripts/mfh: may not check out port directory if only touching files/*
Summary: Tools/scripts/mfh: may not check out port directory if only touching files/*
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Ports Framework (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Port Management Team
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-05-09 16:55 UTC by Matthias Andree
Modified: 2020-06-04 09:20 UTC (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Matthias Andree freebsd_committer freebsd_triage 2020-05-09 16:55:16 UTC 
Try:

${PORTSDIR}/Tools/scripts/mfh 534788

You'll see that mfh checks out only the files/ directory, so I cannot directly test build the port:

$ tree /tmp/merge.neS0T1/2020Q2/
/tmp/merge.neS0T1/2020Q2/
└── graphics
    └── darktable
        └── files
            ├── patch-data_kernels_CMakeLists.txt
            ├── patch-src_CMakeLists.txt
            └── patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake

3 directories, 3 files
Comment 1 Matthias Andree freebsd_committer freebsd_triage 2020-05-09 18:14:30 UTC 
Fix proposed in reviews.freebsd.org, see "See Also" URL.
Comment 2 Matthias Andree freebsd_committer freebsd_triage 2020-05-09 18:29:01 UTC 
With the patch, expected output:
$ tree -F
.
└── graphics/
    └── darktable/
        ├── distinfo
        ├── files/
        │   ├── patch-data_kernels_CMakeLists.txt
        │   ├── patch-src_CMakeLists.txt
        │   └── patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake
        ├── Makefile
        ├── pkg-descr
        └── pkg-plist
Comment 3 commit-hook freebsd_committer freebsd_triage 2020-06-04 09:19:57 UTC 
A commit references this bug:

Author: mandree
Date: Thu Jun  4 09:19:51 UTC 2020
New revision: 537876
URL: https://svnweb.freebsd.org/changeset/ports/537876

Log:
  Tools/scripts/mfh: check out entire port directory even if touching only files/

  - remove unused clean() function, trap does it
  - fix race around mktemp/setting up rm trap
  - rename filelist to dirlist so it matches its purpose
  - move defaults up front to the script
  - misc. minor edits

  PR:		246336
  Approved by:	portmgr (mat@)
  Differential Revision:	https://reviews.freebsd.org/D24789

Changes:
  head/Tools/scripts/mfh