aptly repo include skips *.buildinfo

[tirolerstefan]

Today I tried to import self built debian packages to a local aptly repo.
aptly version: 1.1.1+49+g10e0966
Normally, all files should be removed after import. But *.buildinfo were kept on disk.

$ ll
total 92
drwxrwxrwx 2 ftp ftp 4096 Nov 24 09:08 ./
drwxrwxr-x 3 ftp ftp 4096 Nov 23 07:56 ../
-rw-r--r-- 1 ftp ftp 7689 Nov 24 09:08 besi-meta_18.04-1.0_amd64.buildinfo
-rw-r--r-- 1 ftp ftp 4917 Nov 24 09:08 besi-meta_18.04-1.0_amd64.changes
-rw-r--r-- 1 ftp ftp 1290 Nov 24 09:08 besi-meta_18.04-1.0.dsc
-rw-r--r-- 1 ftp ftp 5185 Nov 24 09:08 besi-meta_18.04-1.0_i386.buildinfo
-rw-r--r-- 1 ftp ftp 2047 Nov 24 09:08 besi-meta_18.04-1.0_i386.changes
-rw-r--r-- 1 ftp ftp 3480 Nov 24 09:08 besi-meta_18.04-1.0.tar.xz
-rw-r--r-- 1 ftp ftp 1168 Nov 24 09:08 besi-meta-base_18.04-1.0_all.deb
-rw-r--r-- 1 ftp ftp 1540 Nov 24 09:08 besi-meta-base-x_18.04-1.0_all.deb
-rw-r--r-- 1 ftp ftp 1644 Nov 24 09:08 besi-meta-build-essentials_18.04-1.0_amd64.deb
-rw-r--r-- 1 ftp ftp 1644 Nov 24 09:08 besi-meta-build-essentials_18.04-1.0_i386.deb
-rw-r--r-- 1 ftp ftp 1224 Nov 24 09:08 besi-meta-compilehost_18.04-1.0_all.deb
-rw-r--r-- 1 ftp ftp 1304 Nov 24 09:08 besi-meta-desktop_18.04-1.0_all.deb
-rw-r--r-- 1 ftp ftp 1240 Nov 24 09:08 besi-meta-devel_18.04-1.0_amd64.deb
-rw-r--r-- 1 ftp ftp 1240 Nov 24 09:08 besi-meta-devel_18.04-1.0_i386.deb
-rw-r--r-- 1 ftp ftp 1128 Nov 24 09:08 besi-meta-indel_18.04-1.0_all.deb
-rw-r--r-- 1 ftp ftp 1376 Nov 24 09:08 besi-meta-workstation-base_18.04-1.0_all.deb
-rw-r--r-- 1 ftp ftp 1168 Nov 24 09:08 besi-meta-workstation-extra_18.04-1.0_all.deb
-rw-r--r-- 1 ftp ftp 1812 Nov 24 09:08 besi-meta-workstation-sw_18.04-1.0_all.deb

I checked whether the buildinfo files are within the changes files:

$ grep buildinfo *.changes
besi-meta_18.04-1.0_amd64.changes: 1ab9313308582c4d83695ea1bf926e59e259f965 7689 besi-meta_18.04-1.0_amd64.buildinfo
besi-meta_18.04-1.0_amd64.changes: 48503a73b1cb1dca80955f36b95373ba1ed0842d816adaed24c373368aefd6a6 7689 besi-meta_18.04-1.0_amd64.buildinfo
besi-meta_18.04-1.0_amd64.changes: 7ca8be7b14148c4b8ce9ac80acec2757 7689 metapackages extra besi-meta_18.04-1.0_amd64.buildinfo
besi-meta_18.04-1.0_i386.changes: 1ff375bdb38ddb75f7978ca918800435c638c631 5185 besi-meta_18.04-1.0_i386.buildinfo
besi-meta_18.04-1.0_i386.changes: 05375acb4c20c12bbf004da9f936109ff627fddbe03da17de0aabec144f24013 5185 besi-meta_18.04-1.0_i386.buildinfo
besi-meta_18.04-1.0_i386.changes: 6974f1b61fc0dfa9424965f7d7d12724 5185 metapackages extra besi-meta_18.04-1.0_i386.buildinfo

After include, it looks like this:

$ aptly repo include -no-remove-files=false -accept-unsigned=true -ignore-signatures=true -repo=elektra-incoming /home/distro/aptly/incoming/elektra
Loading repository elektra-incoming for changes file besi-meta_18.04-1.0_amd64.changes...
[+] besi-meta-base-x_18.04-1.0_all added
[+] besi-meta-base_18.04-1.0_all added
[+] besi-meta-build-essentials_18.04-1.0_amd64 added
[+] besi-meta-compilehost_18.04-1.0_all added
[+] besi-meta-desktop_18.04-1.0_all added
[+] besi-meta-devel_18.04-1.0_amd64 added
[+] besi-meta-indel_18.04-1.0_all added
[+] besi-meta-workstation-base_18.04-1.0_all added
[+] besi-meta-workstation-extra_18.04-1.0_all added
[+] besi-meta-workstation-sw_18.04-1.0_all added
[+] besi-meta_18.04-1.0_source added
Loading repository elektra-incoming for changes file besi-meta_18.04-1.0_i386.changes...
[+] besi-meta-build-essentials_18.04-1.0_i386 added
[+] besi-meta-devel_18.04-1.0_i386 added


$ ll
total 24
drwxrwxrwx 2 ftp ftp 4096 Nov 24 09:10 ./
drwxrwxr-x 3 ftp ftp 4096 Nov 23 07:56 ../
-rw-r--r-- 1 ftp ftp 7689 Nov 24 09:08 besi-meta_18.04-1.0_amd64.buildinfo
-rw-r--r-- 1 ftp ftp 5185 Nov 24 09:08 besi-meta_18.04-1.0_i386.buildinfo

Would it be possible to delete those files, too?

[tirolerstefan]

@smira ... if you have time, please take a look at commit 8a4d866, this could be a solution. I didn't find a test file for importing, so I didn't add any tests - sorry for that.
I tested above commit with "aptly repo include..." and "aptly repo add -remove-files...", buildinfo files were removed. Of course, I could add any files to "otherFiles" list, but I thought it's better to be specific, here.

If the change is worth creating a pull request, please tell me.

(btw: reprepro had the same problem: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=843402)

[smira]

Thanks for the fix, I will add thag!