From: Mark Hymers Date: Fri, 30 Oct 2009 11:18:42 +0000 (+0000) Subject: Merge commit 'origin/master' X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=c96ad71b695f3a80504115beb5e4fe8daf410aa6;hp=e0d8e7998f4ad7a88ff7e839cdf86080425a69ea;p=dak.git Merge commit 'origin/master' --- diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index 886fb689..8a3e49d1 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -102,7 +102,7 @@ def init(): ################################################################################ def usage (exit_code=0): - print """Usage: dinstall [OPTION]... [CHANGES]... + print """Usage: dak process-unchecked [OPTION]... [CHANGES]... -a, --automatic automatic run -h, --help show this help and exit. -n, --no-action don't do anything diff --git a/dak/rm.py b/dak/rm.py index be3e1676..00671f60 100755 --- a/dak/rm.py +++ b/dak/rm.py @@ -492,7 +492,7 @@ def main (): game_over() whoami = utils.whoami() - date = commands.getoutput('date -R') + date = commands.getoutput('date -R').strip() # Log first; if it all falls apart I want a record that we at least tried. logfile = utils.open_file(cnf["Rm::LogFile"], 'a') @@ -554,7 +554,10 @@ def main (): if carbon_copy: Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy) Subst["__SUITE_LIST__"] = suites_list - Subst["__SUMMARY__"] = summary + summarymail = "%s\n------------------- Reason -------------------\n%s\n" % (summary, Options["Reason"]) + summarymail += "----------------------------------------------\n" + Subst["__SUMMARY__"] = summarymail + Subst["__SUBJECT__"] = "Removed package(s) from %s" % (suites_list) Subst["__ADMIN_ADDRESS__"] = cnf["Dinstall::MyAdminAddress"] Subst["__DISTRO__"] = cnf["Dinstall::MyDistribution"] Subst["__WHOAMI__"] = whoami diff --git a/templates/contents b/templates/contents index 48950314..1021da45 100644 --- a/templates/contents +++ b/templates/contents @@ -12,22 +12,24 @@ the first is listed. As all Contents files are shipped compressed, the best way to search quickly for a file is with the Unix `zgrep' utility, as in: - `zgrep CONTENTS.gz': + `zgrep CONTENTSFILE.gz': - $ zgrep nose Contents.gz - 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 + $ zgrep -i debian/ Contents-amd64.gz + usr/share/IlohaMail/debian/Ilohamail.apache web/ilohamail + usr/share/R/debian/r-cran.mk devel/r-base-dev + usr/share/apt-listbugs/debian/apt_preferences.rb admin/apt-listbugs + usr/share/apt-listbugs/debian/bts.rb admin/apt-listbugs + usr/share/apt-listbugs/debian/btssoap.rb admin/apt-listbugs + usr/share/apt-listbugs/debian/bug.rb admin/apt-listbugs + usr/share/apt-listbugs/debian/mytempfile.rb admin/apt-listbugs 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 ': - $ dpkg --search /usr/bin/dselect - dpkg: /usr/bin/dselect + $ dpkg --search apt-get + apt: /usr/bin/apt-get -FILE LOCATION \ No newline at end of file +FILE LOCATION diff --git a/templates/rm.bug-close b/templates/rm.bug-close index 7e521e8a..78addd22 100644 --- a/templates/rm.bug-close +++ b/templates/rm.bug-close @@ -6,7 +6,7 @@ X-Debian: DAK MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit -Subject: Bug#__BUG_NUMBER__: fixed +Subject: Bug#__BUG_NUMBER__: __SUBJECT__ We believe that the bug you reported is now fixed; the following package(s) have been removed from __SUITE_LIST__: