Bug#780972: Support override files

[Bas Wijnen]

Package: mini-dinstall
Version: 0.6.30
Severity: wishlist
Tags: patch

apt-ftparchive complains about every package in the archive if no override file
is present.  An override file can be given either as a systemwide setting in
/etc, or on the commandline.  Because there is no reason to require root access
for mini-dinstall users, it would be nice if it was possible to pass the
override file on the commandline.

Attached is a patch which adds an "override" setting to the configuration file
of mini-dinstall, and it passes its value to apt-ftparchive.  When passing this
option and creating an override and override.src file, this removes the
warnings on my system.  The patch does not include documentation for this
option.

Thanks,
Bas

-- System Information:
Debian Release: 8.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: mipsel, armhf, i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages mini-dinstall depends on:
ii  apt-utils   1.0.9.7
ii  python      2.7.9-1
ii  python-apt  0.9.3.11
pn  python:any  <none>

Versions of packages mini-dinstall recommends:
ii  gpgv  1.4.18-7

Versions of packages mini-dinstall suggests:
ii  debian-keyring  2015.03.04

-- no debconf information

diff -urp mini-dinstall-0.6.30.orig/debian/changelog mini-dinstall-0.6.30+nmu1/debian/changelog
--- mini-dinstall-0.6.30.orig/debian/changelog	2014-08-25 22:51:08.000000000 -0400
+++ mini-dinstall-0.6.30+nmu1/debian/changelog	2015-03-22 13:16:31.901672410 -0400
@@ -1,3 +1,10 @@
+mini-dinstall (0.6.30+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Pass override files to ftp-aptarchive
+
+ -- Bas Wijnen <wij...@debian.org>  Sun, 22 Mar 2015 13:15:51 -0400
+
 mini-dinstall (0.6.30) unstable; urgency=low
 
   * [885f9fc] lintian: fix vcs-field-not-canonical
diff -urp mini-dinstall-0.6.30.orig/mini-dinstall mini-dinstall-0.6.30+nmu1/mini-dinstall
--- mini-dinstall-0.6.30.orig/mini-dinstall	2014-08-25 22:51:08.000000000 -0400
+++ mini-dinstall-0.6.30+nmu1/mini-dinstall	2015-03-22 13:08:40.357710669 -0400
@@ -245,6 +245,11 @@ else:
 if configp.has_option('DEFAULT', 'incoming_permissions'):
     incoming_permissions = int(configp.get('DEFAULT', 'incoming_permissions'), 8)
 
+if configp.has_option('DEFAULT', 'override'):
+    override = [configp.get('DEFAULT', 'override')]
+else:
+    override = []
+
 do_mkdir(toplevel_directory)
 dinstall_subdir = os.path.join(toplevel_directory, dinstall_subdir)
 do_mkdir(dinstall_subdir)
@@ -1125,9 +1130,9 @@ class ArchiveDirIndexer(threading.Thread
 
     def _make_indexfile(self, dir, type, name):
         if nodb_mode:
-            cmdline = ['apt-ftparchive', type, dir]
+            cmdline = ['apt-ftparchive', type, dir] + override
         else:
-            cmdline = ['apt-ftparchive', type, dir, '--db', '%s.db' %dir]
+            cmdline = ['apt-ftparchive', type, dir] + override + ['--db', '%s.db' %dir]
 
         self._logger.debug("Running: " + string.join(cmdline, ' '))
         if no_act:

signature.asc
Description: Digital signature