From e6cc279e339fde0099ecf4714aa133c357d2251e Mon Sep 17 00:00:00 2001 From: James Troup Date: Wed, 8 May 2002 11:08:54 +0000 Subject: [PATCH] update --- docs/README.config | 85 ++++++++++++++++++++++++++++++++++++++++----- docs/katie.1.sgml | 20 ++--------- docs/natalie.1.sgml | 32 ++++++++++++----- 3 files changed, 103 insertions(+), 34 deletions(-) diff --git a/docs/README.config b/docs/README.config index 1ee64ca0..56213a19 100644 --- a/docs/README.config +++ b/docs/README.config @@ -25,15 +25,28 @@ Mandatory. List of directory locations, e.g. | Dir | { -| RootDir "/org/ftp.debian.org/ftp/"; -| PoolDir "/org/ftp.debian.org/ftp/pool/"; -| TemplatesDir "/org/ftp.debian.org/katie/templates/"; +| Root "/org/ftp.debian.org/ftp/"; +| Pool "/org/ftp.debian.org/ftp/pool/"; +| Templates "/org/ftp.debian.org/katie/templates/"; | PoolRoot "pool/"; -| IncomingDir "/org/ftp.debian.org/incoming/"; -| OverrideDir "/org/ftp.debian.org/scripts/override/"; -| ListsDir "/org/ftp.debian.org/database/dists/"; -| LogDir "/org/ftp.debian.org/log/"; +| Override "/org/ftp.debian.org/scripts/override/"; +| Lists "/org/ftp.debian.org/database/dists/"; +| Log "/org/ftp.debian.org/log/"; | Morgue "/org/ftp.debian.org/morgue/"; +| Override "/org/ftp.debian.org/scripts/override/"; +| AcceptedAutoBuild "/org/incoming.debian.org/buildd/"; +| UrgencyLog "/org/ftp.debian.org/testing/urgencies/"; +| Queue +| { +| Root "/org/ftp.debian.org/queue/"; +| Accepted "/org/ftp.debian.org/queue/accepted/"; +| Byhand "/org/ftp.debian.org/queue/byhand/"; +| Done "/org/ftp.debian.org/queue/done/"; +| Holding "/org/ftp.debian.org/queue/holding/"; +| New "/org/ftp.debian.org/queue/new/"; +| Reject "/org/ftp.debian.org/queue/reject/"; +| Unchecked "/org/ftp.debian.org/queue/unchecked/"; +| }; | }; ================================================================================ @@ -86,6 +99,43 @@ paths will usually be different. ================================================================================ +SuiteMappings +------------- + +Optional. List of mappings for the Distribution file in a .changes file, e.g.: + +| SuiteMappings +| { +| "map stable proposed-updates"; +| "map frozen unstable"; +| "map-unreleased stable unstable"; +| "map-unreleased proposed-updates unstable"; +| "ignore testing"; +| }; + +There are three mapping types: + +(1) map + + Any target suite of '' is unconditionally overriden to + ''. + +(2) map-unreleased + + Any upload targeted for suite '' will be mapped to + '' iff it contains uploads for an architecture that is not + part of ''. + +(3) ignore + + Any target suite of '' is unconditionally removed from + the list of target suites. NB: if the upload had only one + target suite this will lead to rejection. + +NB: ordering is not guaranteed. + +================================================================================ + Dinstall -------- @@ -146,7 +196,26 @@ timestamps are allowed to be inside a deb before being rejected. PastCutoffYear specifies the cut-off year which is used when deciding whether or not to reject packages based on the file timestamp. -If BXANotify is non-zero/blank a (Debian-specfic) BXA notification is sent. +BXANotify is a boolean; if true (Debian-specfic) BXA notification is +sent. + +OverrideDisparityCheck is a boolean; if true, jennifer compares an +uploads section/priority with the overrides and whines at the +maintainer if they differ. + +CloseBugs is a boolean; if true the automated bug closing feature of +dinstall is activated. + +SpecialAcceptedAutoBuild is a boolean; if true it activates support +for auto-building from accepted. + +OverrideMaintainer can be used to globally override the +__MAINTAINER_TO__ and __MAINTAINER_FROM__ variables in template mails. +Use with caution. + +SkipTime is an integer value which is the number of seconds that a +file must be older than (via it's last modified timestamp) before +jennifer will REJECT rather than SKIP the package. ================================================================================ diff --git a/docs/katie.1.sgml b/docs/katie.1.sgml index 8ea23bf0..ab0e6512 100644 --- a/docs/katie.1.sgml +++ b/docs/katie.1.sgml @@ -17,7 +17,7 @@ katie - Installs packages from incoming + Installs packages from accepted @@ -25,14 +25,14 @@ katie - package + changes_file Description</> <para> - <command>katie</command> is the program which installs packages from incoming into the distribution. + <command>katie</command> is the program which installs packages from the accepted directory into the distribution. </PARA></REFSECT1> <RefSect1><Title>Options</> @@ -53,13 +53,6 @@ </listitem> </varlistentry> - <varlistentry> - <term><option>-k/--ack-new</option></term> - <listitem> - <para>Acknowledge new packages. <emphasis>WARNING:</emphasis> due to the sub-optimal implementation of new packages, this option should only be used when processing *all* packages (e.g. in cron jobs).</para> - </listitem> - </varlistentry> - <varlistentry> <term><option>-m/--manual-reject=<replaceable>message</replaceable></option></term> <listitem> @@ -81,13 +74,6 @@ </listitem> </varlistentry> - <varlistentry> - <term><option>-u/--distribution=<replaceable>distribution</replaceable></option></term> - <listitem> - <para>Override the <literal>Distribution</Literal> field. Should only be used for binary packages otherwise if used on a source package, all binary recompiles of that source will require a similar manual override.</para> - </listitem> - </varlistentry> - <varlistentry> <term><option>-v/--version</option></term> <listitem> diff --git a/docs/natalie.1.sgml b/docs/natalie.1.sgml index 388f6f26..cc5526df 100644 --- a/docs/natalie.1.sgml +++ b/docs/natalie.1.sgml @@ -8,12 +8,12 @@ <refentry> &katie-docinfo; - + <refmeta> <refentrytitle>natalie</> <manvolnum>1</> </refmeta> - + <!-- Man page title --> <refnamediv> <refname>natalie</> @@ -27,18 +27,25 @@ <arg><option><replaceable>options</replaceable></></arg> </cmdsynopsis> </refsynopsisdiv> - + <RefSect1><Title>Description</> - <para> + <para> <command>natalie</command> is the command line tool to handle override files. Override files can be listed to stdout or updated from stdin. <RefSect1><Title>Options</> - + <VariableList> <VarListEntry><term><option>-c/--component=<replaceable>component</replaceable></option></> <ListItem><Para>Uses the override DB for the component listed. The default is <literal>main</literal>.</PARA></LISTITEM> </VarListEntry> - + + <varlistentry> + <term><option>-h/--help</option></term> + <listitem> + <para>Display usage help and then exit.</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>-l/--list</option></term> <listitem> @@ -46,14 +53,21 @@ </listitem> </varlistentry> + <varlistentry> + <term><option>-q/--quiet</option></term> + <listitem> + <para>Be less verbose about what has been done.</para> + </listitem> + </varlistentry> + <VarListEntry><term><option>-s/--suite=<replaceable>suite</replaceable></option></> <ListItem><Para>Uses the override DB for the suite listed. The default is <literal>unstable</literal>.</PARA></LISTITEM> </VarListEntry> - + <VarListEntry><term><option>-S/--set</option></term> <ListItem><Para>Update the override DB based on the contents of stdin. Information on the results of the update are printed to stdout.</PARA></LISTITEM> </VarListEntry> - + <varlistentry> <term><option>-t/--type=<replaceable>type</replaceable></option></term> <listitem> @@ -70,5 +84,5 @@ </RefSect1> &manauthor; - + </refentry> -- 2.39.2