Control: tags -1 + patch On Tue, 2016-10-25 at 14:08 +0800, Paul Wise wrote:
> Some of the Contents files (but not all) have a plain text header in > them with documentation explaining how to use the files. I've attached a patch to remove the headers from the places I found them. -- bye, pabs https://wiki.debian.org/PaulWise
From 2bb68d541401c3d3533b12c36efa58e54a2cb977 Mon Sep 17 00:00:00 2001
From: Paul Wise <p...@debian.org>
Date: Tue, 25 Oct 2016 14:14:28 +0800
Subject: [PATCH] Remove the headers from the Contents files (Closes: #841997)
Primarily machine-readable files are no place for documentation.
---
config/debian/Contents.top | 32 --------------------------------
config/debian/dak.conf | 1 -
daklib/contents.py | 9 ---------
templates/contents | 12 ------------
4 files changed, 54 deletions(-)
delete mode 100644 config/debian/Contents.top
delete mode 100644 templates/contents
diff --git a/config/debian/Contents.top b/config/debian/Contents.top
deleted file mode 100644
index 1fd5918..0000000
--- a/config/debian/Contents.top
+++ /dev/null
@@ -1,32 +0,0 @@
-This file maps each file available in the Debian GNU/Linux system to
-the package from which it originates. It includes packages from the
-DIST distribution for the ARCH architecture.
-
-You can use this list to determine which package contains a specific
-file, or whether or not a specific file is available. The list is
-updated weekly, each architecture on a different day.
-
-When a file is contained in more than one package, all packages are
-listed. When a directory is contained in more than one package, only
-the first is listed.
-
-The best way to search quickly for a file is with the Unix `grep'
-utility, as in `grep <regular expression> CONTENTS':
-
- $ grep nose Contents
- etc/nosendfile net/sendfile
- usr/X11R6/bin/noseguy x11/xscreensaver
- usr/X11R6/man/man1/noseguy.1x.gz x11/xscreensaver
- usr/doc/examples/ucbmpeg/mpeg_encode/nosearch.param graphics/ucbmpeg
- usr/lib/cfengine/bin/noseyparker admin/cfengine
-
-This list contains files in all packages, even though not all of the
-packages are installed on an actual system at once. If you want to
-find out which packages on an installed Debian system provide a
-particular file, you can use `dpkg --search <filename>':
-
- $ dpkg --search /usr/bin/dselect
- dpkg: /usr/bin/dselect
-
-
-FILE LOCATION
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index a7e34cb..cac86b4 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -259,7 +259,6 @@ Urgency
Contents
{
- Header "contents";
Root "/srv/ftp-master.debian.org/test/";
}
diff --git a/daklib/contents.py b/daklib/contents.py
index 75fb5e5..1d9e1ac 100644
--- a/daklib/contents.py
+++ b/daklib/contents.py
@@ -130,21 +130,12 @@ select bc.file, string_agg(o.section || '/' || b.package, ',' order by b.package
}
return BinaryContentsFileWriter(**values)
- def get_header(self):
- '''
- Returns the header for the Contents files as a string.
- '''
- filename = os.path.join(Config()['Dir::Templates'], 'contents')
- with open(filename) as header_file:
- return header_file.read()
-
def write_file(self):
'''
Write the output file.
'''
writer = self.writer()
file = writer.open()
- file.write(self.get_header())
for item in self.fetch():
file.write(item)
writer.close()
diff --git a/templates/contents b/templates/contents
deleted file mode 100644
index 83bfd6d..0000000
--- a/templates/contents
+++ /dev/null
@@ -1,12 +0,0 @@
-This file maps each file available in the Debian GNU/Linux system to
-the package from which it originates. It includes packages from the
-DIST distribution for the ARCH architecture.
-
-You can use this list to determine which package contains a specific
-file, or whether or not a specific file is available.
-
-When a file is contained in more than one package, all packages are
-listed.
-
-
-FILE LOCATION
--
2.9.3
signature.asc
Description: This is a digitally signed message part
