fix(archlinux): .MTREE should have parent dirs as well

[caarlos0]

this walks up the destination and creates the .MTREE entries for the parents too, otherwise packages are not installable by pacman.

if anyone knows a better way to do this, I'm all ears...

closes #638

[codecov]

Codecov Report

Merging #645 (99913b1) into main (5d25139) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main     #645      +/-   ##
==========================================
- Coverage   75.69%   75.68%   -0.01%     
==========================================
  Files          14       14              
  Lines        2942     2941       -1     
==========================================
- Hits         2227     2226       -1     
  Misses        506      506              
  Partials      209      209              

Impacted Files	Coverage Δ
arch/arch.go	78.57% <100.00%> (-0.05%)	⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

[erikgeiser]

I can’t really review this PR right now but from a first glance I think this should be fixed by taking advantage of the new content api I introduced. There we create implicit directories (a dedicated content type) that we add for debs but not for rpms. So arch packages should work like debs in this regard.

[erikgeiser]

We probably just need to add implicit dirs in the content type switch in WriteTo. Currently the parent dirs are probably added as regular file entries due to the default case.

[erikgeiser]

This should do the trick:

 func (me *MtreeEntry) WriteTo(w io.Writer) (int64, error) {
        switch me.Type {
-   case files.TypeDir:
+ case files.TypeDir, files.TypeImplicitDir:
                n, err := fmt.Fprintf(
                        w,
                        "./%s time=%d.0 mode=%o type=dir\n",

However, the test does take the info.Contents into account. In my opinion, the TestArchMtree test should not check for implicit directories. We should add another test, that builds the entire package and then checks if the mtree contains implicit directories.

I'm sorry, but I don't have the time to rewrite the test, otherwise I would have already pushed the diff above.

[caarlos0]

This should do the trick:

 func (me *MtreeEntry) WriteTo(w io.Writer) (int64, error) {
        switch me.Type {
-   case files.TypeDir:
+ case files.TypeDir, files.TypeImplicitDir:
                n, err := fmt.Fprintf(
                        w,
                        "./%s time=%d.0 mode=%o type=dir\n",

However, the test does take the info.Contents into account. In my opinion, the TestArchMtree test should not check for implicit directories. We should add another test, that builds the entire package and then checks if the mtree contains implicit directories.

I'm sorry, but I don't have the time to rewrite the test, otherwise I would have already pushed the diff above.

ah way better indeed, will work on it, thanks!

[cloudflare-workers-and-pages]

Deploying with    Cloudflare Pages

Latest commit:	99913b1
Status:	✅  Deploy successful!
Preview URL:	https://cf9c84f8.nfpm.pages.dev
Branch Preview URL:	https://mtree-tree.nfpm.pages.dev

View logs

[caarlos0]

@erikgeiser fwiw that doesn't work, will look into why later... but the root folders are still missing there...

[erikgeiser]

Yeah I missed this one:

nfpm/arch/arch.go

Line 177 in 571a32b

if content.Type == files.TypeDir {

The mtree entry should always be added.

[caarlos0]

Ah right, I'm 100% blind 😂

[caarlos0]

ight, all fixed, thanks for the help @erikgeiser