Merge lp:~mvo/unattended-upgrades/whitelisting into lp:unattended-upgrades

[Michael Vogt]

Based on lp:~cwarner/unattended-upgrades/whitelisting/ - provide a whitelist option.

[Christopher Warner (cwarner)]

Looking good, works, covers all intended and possible use cases for the whitelisting feature with all niceties. Thanks for all your help here Michael, this should help lots of people.

review: Approve

=== modified file 'README.md'
--- README.md	2013-05-16 08:45:15 +0000
+++ README.md	2014-10-15 08:16:16 +0000
@@ -42,7 +42,7 @@
 "origin:archive".
 
 Origins-Pattern allows you to give a list of
-patterns to match against.  For example:
+(glob-style) patterns to match against.  For example:
 ```
  Unattended-Upgrade::Origins-Pattern {
         "origin=Google\, Inc.,suite=contrib";
@@ -54,6 +54,14 @@
 component "main".  The apt-cache policy short identifiers
 (e.g. "o" for "origin") are also supported.
 
+If you already configure what to install via apt pinning, you can
+simply use "origin=*", e.g.:
+```
+ Unattended-Upgrade::Origins-Pattern {
+        "origin=*";
+ };
+```
+
 All operations are be logged in /var/log/unattended-upgrades/. This
 includes the dpkg output as well.
 
@@ -89,3 +97,34 @@
 your needs. If you do not have this file, just create it or
 create/edit /etc/apt/apt.conf - you can check your configuration by
 running "apt-config dump".
+
+
+Supported Options Reference
+---------------------------
+
+* `Unattended-Upgrade::Package-Whitelist` - list of regular expressions
+ 
+ Only packages that match the regular expressions in this list will be
+ marked for upgrade. By default dependencies of whitelisted packages
+ are allowed. This can be changed to allow only ever allow whitelisted
+ packages with the `Unattended-Upgrade::Package-Whitelist-Strict`
+ boolean option.
+ 
+ Example:
+ ```
+ Unattended-Upgrade::Package-Whitelist {
+     "bash";
+ };
+ ```
+
+* `Unattended-Upgrade::Package-Whitelist-Strict` - boolean
+ 
+ When set, allow only packages in `Unattended-Upgrade::Package-Whitelist`
+ to be upgraded. This means that you also need to list all dependencies
+ of a whitelisted packages, e.g. if A depends on B and only A is
+ whitelisted, it will be held back.
+ 
+ Example:
+ ```
+ Unattended-Upgrade::Package-Whitelist-Strict "true";
+ ```

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-11 13:12:05 +0000
+++ debian/changelog	2014-10-15 08:16:16 +0000
@@ -1,8 +1,35 @@
-unattended-upgrades (0.82.8) UNRELEASED; urgency=low
-
-  * unattended-upgrade:
-    - use mode 0640 and root:adm for the dpkg terminal log files
-      (closes: #757438)
+unattended-upgrades (0.82.10) unstable; urgency=medium
+
+  [ Helge Kreutzmann ]
+  * Move misplaced German program translation update from debian/po/de.po to
+    po/de.po and update debconf translation from Chris Leick, closes: #751162
+
+ -- Michael Vogt <[e-mail]>  Sun, 21 Sep 2014 21:31:20 +0200
+
+unattended-upgrades (0.82.9) unstable; urgency=low
+
+  * po/da.po:
+    - updated, thanks to Joe Dalton, closes: #754130
+  * debian/po/tr.po:
+    - add Turkish translation, thanks to Mert Dirik 
+      closes: #757500
+  * unattended-upgrades:
+    - improve docstring for adjust_candidate_versions
+    - ignore versions with pin priority < 100 (instead of < 0),
+      thanks to Stefano Zacchiroli
+    - raise error if there are marked removals in the cache
+      (as a extra precaution)
+  * README.md:
+    - add example for matching all upgradable packages
+      (thanks to Paul van der Vlis for the suggestion)
+
+ -- Michael Vogt <[e-mail]>  Thu, 21 Aug 2014 09:42:52 +0200
+
+unattended-upgrades (0.82.8) unstable; urgency=low
+
+  * really add unattended-upgrades.service file, thanks
+    to Simon McVittie (closes: #745992)
+  * pep8 fixes
     - fix output when "dpkg --configure -a" is run to recover
       from a unclean state
     - log to a rotated and compressed
@@ -13,7 +40,7 @@
     - set /var/log/unattended-upgrades/ permissions to 0750
       (closes: #757438). Thanks to Joey Hess
 
- -- Michael Vogt <[e-mail]>  Thu, 11 Sep 2014 13:26:03 +0200
+ -- Michael Vogt <[e-mail]>  Fri, 04 Jul 2014 16:55:19 +0200
 
 unattended-upgrades (0.82.7) unstable; urgency=low
 

=== modified file 'debian/po/de.po'
--- debian/po/de.po	2014-03-18 15:04:13 +0000
+++ debian/po/de.po	2014-10-15 08:16:16 +0000
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: unattended-upgrades 0.82.3\n"
+"Project-Id-Version: unattended-upgrades 0.82.7\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2013-09-13 08:12+0200\n"
-"PO-Revision-Date: 2014-03-16 13:16+0100\n"
+"POT-Creation-Date: 2009-07-06 17:32+0100\n"
+"PO-Revision-Date: 2014-06-04 22:34+0100\n"
 "Last-Translator: Chris Leick <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\n"
 "Language: de\n"
@@ -18,222 +18,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../unattended-upgrade:136
-#, c-format
-msgid "Progress: %s %% (%s)"
-msgstr "Fortschritt: %s %% (%s)"
-
-#: ../unattended-upgrade:352 ../unattended-upgrade:436
-#: ../unattended-upgrade-shutdown:161
-msgid "All upgrades installed"
-msgstr "alle Upgrades installiert"
-
-#: ../unattended-upgrade:354 ../unattended-upgrade:428
-msgid "Installing the upgrades failed!"
-msgstr "Installation der Upgrades fehlgeschlagen!"
-
-#: ../unattended-upgrade:355 ../unattended-upgrade:429
-#, c-format
-msgid "error message: '%s'"
-msgstr "Fehlermeldung: »%s«"
-
-#: ../unattended-upgrade:356 ../unattended-upgrade:430
-#, c-format
-msgid "dpkg returned a error! See '%s' for details"
-msgstr "Dpkg gab einen Fehler zurück. Siehe »%s« für Einzelheiten"
-
-#: ../unattended-upgrade:685
-msgid ""
-"No '/usr/bin/mail' or '/usr/sbin/sendmail',can not send mail. You probably "
-"want to install the 'mailx' package."
-msgstr ""
-"kein »/usr/bin/mail« oder »/usr/sbin/sendmail«, Mail kann nicht gesandt "
-"werden. Möglicherweise möchten Sie das Paket »mailx« installieren."
-
-#: ../unattended-upgrade:698
-#, c-format
-msgid "[reboot required] unattended-upgrades result for '%s': %s"
-msgstr "[Neustart erforderlich] Unattended-Upgrades-Ergebnis für »%s«: %s"
-
-#: ../unattended-upgrade:701
-#, c-format
-msgid "unattended-upgrades result for '%s': '%s'"
-msgstr "Unattended-Upgrades-Ergebnis für »%s«: %s"
-
-#: ../unattended-upgrade:703
-#, c-format
-msgid ""
-"Unattended upgrade returned: %s\n"
-"\n"
-msgstr ""
-"Das unbeaufsichtigte Upgrade gab %s zurück.\n"
-"\n"
-
-#: ../unattended-upgrade:706
-msgid ""
-"Warning: A reboot is required to complete this upgrade.\n"
-"\n"
-msgstr ""
-"Warnung: Um dieses Upgrade zu komplettieren, ist ein Neustart erforderlich.\n"
-"\n"
-
-#: ../unattended-upgrade:708
-msgid "Packages that were upgraded:\n"
-msgstr "Pakete, von denen ein Upgrade durchgeführt wurde:\n"
-
-#: ../unattended-upgrade:710
-msgid "Packages that attempted to upgrade:\n"
-msgstr "Pakete, bei denen versucht wurde, ein Upgrade durchzuführen:\n"
-
-#: ../unattended-upgrade:714
-msgid "Packages with upgradable origin but kept back:\n"
-msgstr ""
-"Pakete, von deren Ursprung ein Upgrade durchgeführt werden kann, die aber\n"
-"zurückgehalten werden.\n"
-
-#: ../unattended-upgrade:719
-msgid "Package installation log:"
-msgstr "Paketinstallationsprotokoll:"
-
-#: ../unattended-upgrade:723
-msgid "Unattended-upgrades log:\n"
-msgstr "Unattended-Upgrades-Protokoll:\n"
-
-#: ../unattended-upgrade:747
-#, c-format
-msgid "Writing dpkg log to '%s'"
-msgstr "Dpkg-Protokoll wird nach »%s« geschrieben"
-
-#: ../unattended-upgrade:873
-#, c-format
-msgid "Initial blacklisted packages: %s"
-msgstr "Pakete, die anfangs auf die schwarzen Liste standen: %s"
-
-#: ../unattended-upgrade:875
-msgid "Starting unattended upgrades script"
-msgstr "Skript für unbeaufsichtigte Upgrades wird gestartet."
-
-#: ../unattended-upgrade:878
-#, c-format
-msgid "Allowed origins are: %s"
-msgstr "erlaubte Ursprünge sind: %s"
-
-#: ../unattended-upgrade:891 ../unattended-upgrade:892
-msgid "Unclean dpkg state detected, trying to correct"
-msgstr "unsauberer Dpkg-Status entdeckt, es wird versucht dies zu korrigieren"
-
-#: ../unattended-upgrade:901
-#, c-format
-msgid ""
-"dpkg --configure -a output:\n"
-"%s"
-msgstr ""
-"»dpkg --configure -a«-Ausgabe:\n"
-"%s"
-
-#: ../unattended-upgrade:910
-msgid "Lock could not be acquired (another package manager running?)"
-msgstr ""
-"Sperrung konnte nicht erreicht werden (läuft eine weitere Paketverwaltung?)"
-
-#: ../unattended-upgrade:912
-msgid "Cache lock can not be acquired, exiting"
-msgstr "Zwischenspeicher konnte nicht gesperrt werden, wird beendet"
-
-#: ../unattended-upgrade:919 ../unattended-upgrade:920
-msgid "Cache has broken packages, exiting"
-msgstr "Zwischenspeicher enthält beschädigte Pakete, wird beendet"
-
-#: ../unattended-upgrade:961
-#, c-format
-msgid "package '%s' upgradable but fails to be marked for upgrade (%s)"
-msgstr ""
-"Von Paket »%s« könnte ein Upgrade durchgeführt werden, es ist jedoch "
-"fehlgeschlagen, dies für das Upgrade zu markieren (%s)"
-
-#: ../unattended-upgrade:982
-#, c-format
-msgid "GetArchives() failed: '%s'"
-msgstr "GetArchives() fehlgeschlagen: »%s«"
-
-#: ../unattended-upgrade:992 ../unattended-upgrade:993
-#, c-format
-msgid "An error occurred: '%s'"
-msgstr "Es ist ein Fehler aufgetreten: »%s«"
-
-#: ../unattended-upgrade:995 ../unattended-upgrade:997
-#, c-format
-msgid "The URI '%s' failed to download, aborting"
-msgstr "Herunterladen von der URI »%s« fehlgeschlagen, wird abgebrochen"
-
-#: ../unattended-upgrade:1001
-#, c-format
-msgid "Download finished, but file '%s' not there?!?"
-msgstr "Herunterladen beendet, aber Datei »%s« ist nicht dort!?"
-
-#: ../unattended-upgrade:1017 ../unattended-upgrade:1021
-#, c-format
-msgid "Package '%s' has conffile prompt and needs to be upgraded manually"
-msgstr ""
-"Das Paket »%s« hat eine Conffile-Abfrage und muss einem manuellen Upgrade "
-"unterzogen werden."
-
-#: ../unattended-upgrade:1044
-#, c-format
-msgid "package '%s' not upgraded"
-msgstr "Von Paket »%s« wurde kein Upgrade durchgeführt."
-
-#: ../unattended-upgrade:1059
-#, c-format
-msgid "Packages that are auto removed: '%s'"
-msgstr "Pakete, die automatisch entfernt wurden: »%s«"
-
-#: ../unattended-upgrade:1068
-msgid "No packages found that can be upgraded unattended"
-msgstr ""
-"Es wurden keine Pakete gefunden, von denen ein unbeaufsichtigtes Upgrade "
-"durchgeführt werden kann."
-
-#: ../unattended-upgrade:1088
-#, c-format
-msgid "Packages that will be upgraded: %s"
-msgstr "Pakete, von denen ein Upgrade durchgeführt wird: %s"
-
-#: ../unattended-upgrade:1125
-msgid "print debug messages"
-msgstr "Nachrichten zur Fehlersuche ausgeben"
-
-#: ../unattended-upgrade:1128
-msgid "make apt/libapt print verbose debug messages"
-msgstr "APT/LibAPT detaillierte Nachrichten zur Fehlersuche ausgeben lassen"
-
-#: ../unattended-upgrade:1131
-msgid "print info messages"
-msgstr "Informationsnachrichten ausgeben"
-
-#: ../unattended-upgrade:1134
-msgid "Simulation, download but do not install"
-msgstr "Simulation, herunterladen, aber nicht installieren"
-
-#: ../unattended-upgrade:1137
-msgid "Upgrade in minimal steps (and allow interrupting with SIGINT"
-msgstr "Upgrade in minimalen Schritten (Unterbrechung mit SIGINT erlaubt)"
-
-#: ../unattended-upgrade:1142
-msgid "You need to be root to run this application"
-msgstr "Sie müssen Root sein, um diese Anwendung auszuführen."
-
-#: ../unattended-upgrade-shutdown:72
-msgid "Unattended-upgrade in progress during shutdown, sleeping for 5s"
-msgstr ""
-"Unattended-Upgrade läuft während des Herunterfahrens weiter, es wird fünf "
-"Sekunden lang gewartet."
-
-#: ../unattended-upgrade-shutdown:125
-msgid "Running unattended-upgrades in shutdown mode"
-msgstr "Unattended-Upgrades im Herunterfahrmodus ausführen"
-
-#: ../unattended-upgrade-shutdown:153
-#, c-format
-msgid "Giving up on lockfile after %s delay"
-msgstr "Sperrdatei, hier wird nach %s Verzögerung aufgegeben."
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Automatically download and install stable updates?"
+msgstr "Aktualisierungen für Stable automatisch herunterladen und installieren?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Applying updates on a frequent basis is an important part of keeping systems "
+"secure. By default, updates need to be applied manually using package  "
+"management tools. Alternatively, you can choose to have this system  "
+"automatically download and install security updates."
+msgstr ""
+"Häufige Aktualisierungen sind wichtig, um Systeme sicher zu halten. "
+"Standardmäßig müssen Aktualisierungen manuell mittels "
+"Paketverwaltungswerkzeugen durchgeführt werden. Alternativ können Sie "
+"auswählen, dass dieses System Sicherheitsaktualisierungen automatisch "
+"herunterlädt und installiert."

=== added file 'debian/po/tr.po'
--- debian/po/tr.po	1970-01-01 00:00:00 +0000
+++ debian/po/tr.po	2014-10-15 08:16:16 +0000
@@ -0,0 +1,40 @@
+# Turkish translation of unattended-upgrades package
+# Copyright (C) 2014 Mert Dirik
+# This file is distributed under the same license as the unattended-upgrades package.
+# Mert Dirik <[e-mail]>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: unattended-upgrades 0.82.8\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-07-06 17:32+0100\n"
+"PO-Revision-Date: 2014-08-03 17:03+0200\n"
+"Last-Translator: Mert Dirik <[e-mail]>\n"
+"Language-Team: Debian L10n Turkish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
+"Language: tr\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Automatically download and install stable updates?"
+msgstr ""
+"Kararlı sürüm güncellemeleri otomatik olarak indirilsin ve kurulsun mu?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Applying updates on a frequent basis is an important part of keeping systems "
+"secure. By default, updates need to be applied manually using package  "
+"management tools. Alternatively, you can choose to have this system  "
+"automatically download and install security updates."
+msgstr ""
+"Sisteminiz için yayımlanan güncellemeleri sık sık uygulamak sisteminizi "
+"güvenli tutmanın önemli bir parçasıdır. Öntanımlı durumda güncellemeleri "
+"paket yönetim araçlarını kullanarak elle uygulamanız gerekir. Bunun yerine, "
+"bu sistemi güvenlik güncellemelerini otomatik olarak indirecek ve kuracak "
+"şekilde ayarlayabilirsiniz."

=== added file 'debian/unattended-upgrades.service'
--- debian/unattended-upgrades.service	1970-01-01 00:00:00 +0000
+++ debian/unattended-upgrades.service	2014-10-15 08:16:16 +0000
@@ -0,0 +1,12 @@
+[Unit]
+Description=Unattended Upgrades
+DefaultDependencies=no
+Before=shutdown.target reboot.target halt.target
+Documentation=man:unattended-upgrade(8)
+
+[Service]
+Type=oneshot
+ExecStart=/usr/share/unattended-upgrades/unattended-upgrade-shutdown
+
+[Install]
+WantedBy=shutdown.target

=== modified file 'po/da.po'
--- po/da.po	2012-06-18 07:22:43 +0000
+++ po/da.po	2014-10-15 08:16:16 +0000
@@ -1,14 +1,14 @@
 # Danish translation unattended-upgrades.
-# Copyright (C) 2012 unattended-upgrades & nedenstående oversættere.
+# Copyright (C) 2014 unattended-upgrades & nedenstående oversættere.
 # This file is distributed under the same license as the unattended-upgrades package.
-# Joe Hansen <[e-mail]>, 2012.
+# Joe Hansen <[e-mail]>, 2012, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: unattended-upgrades\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-19 15:24+0200\n"
-"PO-Revision-Date: 2012-06-16 23:51+0200\n"
+"POT-Creation-Date: 2013-09-13 08:12+0200\n"
+"PO-Revision-Date: 2014-07-07 23:51+0200\n"
 "Last-Translator: Joe Hansen <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]>\n"
 "Language: da\n"
@@ -16,53 +16,49 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../unattended-upgrade:72
+#: ../unattended-upgrade:136
 #, c-format
 msgid "Progress: %s %% (%s)"
 msgstr "Status: %s %% (%s)"
 
-#: ../unattended-upgrade:190 ../unattended-upgrade:254
+#: ../unattended-upgrade:352 ../unattended-upgrade:436
+#: ../unattended-upgrade-shutdown:161
 msgid "All upgrades installed"
 msgstr "Alle opgraderinger er installeret"
 
-#: ../unattended-upgrade:192 ../unattended-upgrade:246
+#: ../unattended-upgrade:354 ../unattended-upgrade:428
 msgid "Installing the upgrades failed!"
 msgstr "Installation af opgraderingerne mislykkedes!"
 
-#: ../unattended-upgrade:193 ../unattended-upgrade:247
+#: ../unattended-upgrade:355 ../unattended-upgrade:429
 #, c-format
 msgid "error message: '%s'"
 msgstr "fejlbesked: »%s«"
 
-#: ../unattended-upgrade:194 ../unattended-upgrade:248
+#: ../unattended-upgrade:356 ../unattended-upgrade:430
 #, c-format
 msgid "dpkg returned a error! See '%s' for details"
 msgstr "dpkg returnerede en fejl! Se »%s« for detaljer"
 
-#: ../unattended-upgrade:231
-#, c-format
-msgid "Progress: %s %%: (%s)"
-msgstr "Status: %s %%: (%s)"
-
-#: ../unattended-upgrade:412
+#: ../unattended-upgrade:685
 msgid ""
-"No '/usr/bin/mail', can not send mail. You probably want to install the "
-"'mailx' package."
+"No '/usr/bin/mail' or '/usr/sbin/sendmail',can not send mail. You probably "
+"want to install the 'mailx' package."
 msgstr ""
-"Ingen »/usr/bin/mail«, kan ikke sende post. Du skal sikkert installere "
-"pakken »mailx«."
-
-#: ../unattended-upgrade:423
-#, c-format
-msgid "[reboot required] unattended-upgrades result for '%s'"
-msgstr "[genstart krævet] unattended-upgrades resultat for »%s«"
-
-#: ../unattended-upgrade:425
-#, c-format
-msgid "unattended-upgrades result for '%s'"
-msgstr "unattended-upgrades resultat for »%s«"
-
-#: ../unattended-upgrade:428
+"Ingen »/usr/bin/mail« eller »/usr/sbin/sendmail« kan sende post. Du skal "
+"sikkert installere pakken »mailx«."
+
+#: ../unattended-upgrade:698
+#, c-format
+msgid "[reboot required] unattended-upgrades result for '%s': %s"
+msgstr "[genstart krævet] unattended-upgrades resultat for »%s: %s«"
+
+#: ../unattended-upgrade:701
+#, c-format
+msgid "unattended-upgrades result for '%s': '%s'"
+msgstr "unattended-upgrades resultat for »%s«: »%s«"
+
+#: ../unattended-upgrade:703
 #, c-format
 msgid ""
 "Unattended upgrade returned: %s\n"
@@ -71,7 +67,7 @@
 "Unattended upgrade returnerede: %s\n"
 "\n"
 
-#: ../unattended-upgrade:430
+#: ../unattended-upgrade:706
 msgid ""
 "Warning: A reboot is required to complete this upgrade.\n"
 "\n"
@@ -79,41 +75,50 @@
 "Advarsel: En genstart er krævet for at færdiggøre denne opgradering.\n"
 "\n"
 
-#: ../unattended-upgrade:431
-msgid "Packages that are upgraded:\n"
-msgstr "Pakker som opgraderes:\n"
-
-#: ../unattended-upgrade:435
+#: ../unattended-upgrade:708
+msgid "Packages that were upgraded:\n"
+msgstr "Pakker som blev opgraderet:\n"
+
+#: ../unattended-upgrade:710
+msgid "Packages that attempted to upgrade:\n"
+msgstr "Pakker som forsøgte at opgradere:\n"
+
+#: ../unattended-upgrade:714
 msgid "Packages with upgradable origin but kept back:\n"
 msgstr "Pakker med opgraderbar oprindelse men holdt tilbage:\n"
 
-#: ../unattended-upgrade:439
+#: ../unattended-upgrade:719
 msgid "Package installation log:"
 msgstr "Log for pakkeinstallation:"
 
-#: ../unattended-upgrade:442
+#: ../unattended-upgrade:723
 msgid "Unattended-upgrades log:\n"
 msgstr "Log for unattended-upgrades:\n"
 
-#: ../unattended-upgrade:513
+#: ../unattended-upgrade:747
+#, c-format
+msgid "Writing dpkg log to '%s'"
+msgstr "Skriver dpkg-log til »%s«"
+
+#: ../unattended-upgrade:873
 #, c-format
 msgid "Initial blacklisted packages: %s"
 msgstr "Oprindelig sortlistede pakker: %s"
 
-#: ../unattended-upgrade:514
+#: ../unattended-upgrade:875
 msgid "Starting unattended upgrades script"
 msgstr "Starter skript for unattended upgrades"
 
-#: ../unattended-upgrade:517
+#: ../unattended-upgrade:878
 #, c-format
 msgid "Allowed origins are: %s"
 msgstr "Tilladte oprindelser er: %s"
 
-#: ../unattended-upgrade:528 ../unattended-upgrade:529
+#: ../unattended-upgrade:891 ../unattended-upgrade:892
 msgid "Unclean dpkg state detected, trying to correct"
 msgstr "Uklar dpkg-tilstand detekteret, forsøger at rette"
 
-#: ../unattended-upgrade:538
+#: ../unattended-upgrade:901
 #, c-format
 msgid ""
 "dpkg --configure -a output:\n"
@@ -122,95 +127,102 @@
 "dpkg --configure -a output:\n"
 "%s"
 
-#: ../unattended-upgrade:546
+#: ../unattended-upgrade:910
 msgid "Lock could not be acquired (another package manager running?)"
 msgstr "Lås kunne ikke indhentes (kører en anden pakkehåndtering?)"
 
-#: ../unattended-upgrade:548
+#: ../unattended-upgrade:912
 msgid "Cache lock can not be acquired, exiting"
 msgstr "Lås for mellemlager kan ikke indhentes, afslutter"
 
-#: ../unattended-upgrade:554 ../unattended-upgrade:555
+#: ../unattended-upgrade:919 ../unattended-upgrade:920
 msgid "Cache has broken packages, exiting"
 msgstr "Mellemlager har ødelagte pakker, afslutter"
 
-#: ../unattended-upgrade:581
+#: ../unattended-upgrade:961
 #, c-format
 msgid "package '%s' upgradable but fails to be marked for upgrade (%s)"
 msgstr "pakke »%s« kan opgraderes men fejler i markering for opgradering (%s)"
 
-#: ../unattended-upgrade:601
+#: ../unattended-upgrade:982
 #, c-format
 msgid "GetArchives() failed: '%s'"
 msgstr "GetArchives() mislykkedes: »%s«"
 
-#: ../unattended-upgrade:610 ../unattended-upgrade:611
+#: ../unattended-upgrade:992 ../unattended-upgrade:993
 #, c-format
-msgid "An error ocured: '%s'"
+msgid "An error occurred: '%s'"
 msgstr "Der opstod en fejl: »%s«"
 
-#: ../unattended-upgrade:613 ../unattended-upgrade:614
+#: ../unattended-upgrade:995 ../unattended-upgrade:997
 #, c-format
 msgid "The URI '%s' failed to download, aborting"
 msgstr "Der kunne ikke hentes fra adressen »%s«, afbryder"
 
-#: ../unattended-upgrade:617
+#: ../unattended-upgrade:1001
 #, c-format
 msgid "Download finished, but file '%s' not there?!?"
 msgstr "Hentning færdig, men filen »%s« var der ikke?!?"
 
-#: ../unattended-upgrade:626
+#: ../unattended-upgrade:1017 ../unattended-upgrade:1021
 #, c-format
 msgid "Package '%s' has conffile prompt and needs to be upgraded manually"
 msgstr ""
 "Pakke »%s« bliver spurgt om oplysninger fra konfigurationsfilen og skal "
 "opgraderes manuelt"
 
-#: ../unattended-upgrade:648
+#: ../unattended-upgrade:1044
 #, c-format
 msgid "package '%s' not upgraded"
 msgstr "pakke »%s« blev ikke opgraderet"
 
-#: ../unattended-upgrade:662
+#: ../unattended-upgrade:1059
 #, c-format
 msgid "Packages that are auto removed: '%s'"
 msgstr "Pakker som automatisk fjernes: »%s«"
 
-#: ../unattended-upgrade:669
+#: ../unattended-upgrade:1068
 msgid "No packages found that can be upgraded unattended"
 msgstr "Ingen pakker fundet som kan opgraderes uden ledsager"
 
-#: ../unattended-upgrade:679
-#, c-format
-msgid "Packages that are upgraded: %s"
-msgstr "Pakker som blev opgraderet: %s"
-
-#: ../unattended-upgrade:693
-#, c-format
-msgid "Writing dpkg log to '%s'"
-msgstr "Skriver dpkg-log til »%s«"
-
-#: ../unattended-upgrade:744
+#: ../unattended-upgrade:1088
+#, c-format
+msgid "Packages that will be upgraded: %s"
+msgstr "Pakker som vil blive opgraderet: %s"
+
+#: ../unattended-upgrade:1125
 msgid "print debug messages"
 msgstr "vis fejlsøgningsbeskeder"
 
-#: ../unattended-upgrade:747
+#: ../unattended-upgrade:1128
+msgid "make apt/libapt print verbose debug messages"
+msgstr "lad apt/libapt vise uddybende fejlsøgningsbeskeder"
+
+#: ../unattended-upgrade:1131
+msgid "print info messages"
+msgstr "vis informationsbeskeder"
+
+#: ../unattended-upgrade:1134
 msgid "Simulation, download but do not install"
 msgstr "Simulation, hent men installer ikke"
 
-#: ../unattended-upgrade:750
+#: ../unattended-upgrade:1137
 msgid "Upgrade in minimal steps (and allow interrupting with SIGINT"
 msgstr "Opgrader i små trin (og tillad afbrydelse med SIGINT)"
 
-#: ../unattended-upgrade:754
+#: ../unattended-upgrade:1142
 msgid "You need to be root to run this application"
 msgstr "Du skal være administrator (root) for at køre dette program"
 
-#: ../unattended-upgrade-shutdown:95
+#: ../unattended-upgrade-shutdown:72
 msgid "Unattended-upgrade in progress during shutdown, sleeping for 5s"
 msgstr "Unattended-upgrade i gang under nedlukning, sover for 5 sekunder"
 
-#: ../unattended-upgrade-shutdown:106
+#: ../unattended-upgrade-shutdown:125
+msgid "Running unattended-upgrades in shutdown mode"
+msgstr "Kører unattended-upgrades i nedlukningstilstand"
+
+#: ../unattended-upgrade-shutdown:153
 #, c-format
 msgid "Giving up on lockfile after %s delay"
 msgstr "Opgiver låsefilen efter %s forsinkelse"

=== modified file 'po/de.po'
--- po/de.po	2012-06-20 07:02:22 +0000
+++ po/de.po	2014-10-15 08:16:16 +0000
@@ -1,15 +1,15 @@
 # Translation of unattended-upgrades to German.
-# Copyright (C) .
+# Copyright (C) 2005-2009 Canonical Ltd.
 # This file is distributed under the same license as the
 # unattended-upgrades package.
-# Copyright (C) of this file 2012 Chris Leick.
+# Copyright (C) of this file 2012-2014 Chris Leick.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: unattended-upgrades 0.77\n"
+"Project-Id-Version: unattended-upgrades 0.82.3\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-07-19 15:24+0200\n"
-"PO-Revision-Date: 2012-06-14 21:28+0200\n"
+"POT-Creation-Date: 2013-09-13 08:12+0200\n"
+"PO-Revision-Date: 2014-03-16 13:16+0100\n"
 "Last-Translator: Chris Leick <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\n"
 "Language: de\n"
@@ -18,53 +18,49 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../unattended-upgrade:72
+#: ../unattended-upgrade:136
 #, c-format
 msgid "Progress: %s %% (%s)"
 msgstr "Fortschritt: %s %% (%s)"
 
-#: ../unattended-upgrade:190 ../unattended-upgrade:254
+#: ../unattended-upgrade:352 ../unattended-upgrade:436
+#: ../unattended-upgrade-shutdown:161
 msgid "All upgrades installed"
 msgstr "alle Upgrades installiert"
 
-#: ../unattended-upgrade:192 ../unattended-upgrade:246
+#: ../unattended-upgrade:354 ../unattended-upgrade:428
 msgid "Installing the upgrades failed!"
 msgstr "Installation der Upgrades fehlgeschlagen!"
 
-#: ../unattended-upgrade:193 ../unattended-upgrade:247
+#: ../unattended-upgrade:355 ../unattended-upgrade:429
 #, c-format
 msgid "error message: '%s'"
 msgstr "Fehlermeldung: »%s«"
 
-#: ../unattended-upgrade:194 ../unattended-upgrade:248
+#: ../unattended-upgrade:356 ../unattended-upgrade:430
 #, c-format
 msgid "dpkg returned a error! See '%s' for details"
 msgstr "Dpkg gab einen Fehler zurück. Siehe »%s« für Einzelheiten"
 
-#: ../unattended-upgrade:231
-#, c-format
-msgid "Progress: %s %%: (%s)"
-msgstr "Fortschritt: %s %%: (%s)"
-
-#: ../unattended-upgrade:412
+#: ../unattended-upgrade:685
 msgid ""
-"No '/usr/bin/mail', can not send mail. You probably want to install the "
-"'mailx' package."
+"No '/usr/bin/mail' or '/usr/sbin/sendmail',can not send mail. You probably "
+"want to install the 'mailx' package."
 msgstr ""
-"kein »/usr/bin/mail«, Mail kann nicht gesandt werden. Möglicherweise möchten "
-"Sie das Paket »mailx« installieren."
-
-#: ../unattended-upgrade:423
-#, c-format
-msgid "[reboot required] unattended-upgrades result for '%s'"
-msgstr "[Neustart erforderlich] Unattended-Upgrades-Ergebnis für »%s«"
-
-#: ../unattended-upgrade:425
-#, c-format
-msgid "unattended-upgrades result for '%s'"
-msgstr "Unattended-Upgrades-Ergebnis für »%s«"
-
-#: ../unattended-upgrade:428
+"kein »/usr/bin/mail« oder »/usr/sbin/sendmail«, Mail kann nicht gesandt "
+"werden. Möglicherweise möchten Sie das Paket »mailx« installieren."
+
+#: ../unattended-upgrade:698
+#, c-format
+msgid "[reboot required] unattended-upgrades result for '%s': %s"
+msgstr "[Neustart erforderlich] Unattended-Upgrades-Ergebnis für »%s«: %s"
+
+#: ../unattended-upgrade:701
+#, c-format
+msgid "unattended-upgrades result for '%s': '%s'"
+msgstr "Unattended-Upgrades-Ergebnis für »%s«: %s"
+
+#: ../unattended-upgrade:703
 #, c-format
 msgid ""
 "Unattended upgrade returned: %s\n"
@@ -73,7 +69,7 @@
 "Das unbeaufsichtigte Upgrade gab %s zurück.\n"
 "\n"
 
-#: ../unattended-upgrade:430
+#: ../unattended-upgrade:706
 msgid ""
 "Warning: A reboot is required to complete this upgrade.\n"
 "\n"
@@ -81,43 +77,52 @@
 "Warnung: Um dieses Upgrade zu komplettieren, ist ein Neustart erforderlich.\n"
 "\n"
 
-#: ../unattended-upgrade:431
-msgid "Packages that are upgraded:\n"
+#: ../unattended-upgrade:708
+msgid "Packages that were upgraded:\n"
 msgstr "Pakete, von denen ein Upgrade durchgeführt wurde:\n"
 
-#: ../unattended-upgrade:435
+#: ../unattended-upgrade:710
+msgid "Packages that attempted to upgrade:\n"
+msgstr "Pakete, bei denen versucht wurde, ein Upgrade durchzuführen:\n"
+
+#: ../unattended-upgrade:714
 msgid "Packages with upgradable origin but kept back:\n"
 msgstr ""
 "Pakete, von deren Ursprung ein Upgrade durchgeführt werden kann, die aber\n"
 "zurückgehalten werden.\n"
 
-#: ../unattended-upgrade:439
+#: ../unattended-upgrade:719
 msgid "Package installation log:"
 msgstr "Paketinstallationsprotokoll:"
 
-#: ../unattended-upgrade:442
+#: ../unattended-upgrade:723
 msgid "Unattended-upgrades log:\n"
 msgstr "Unattended-Upgrades-Protokoll:\n"
 
-#: ../unattended-upgrade:513
+#: ../unattended-upgrade:747
+#, c-format
+msgid "Writing dpkg log to '%s'"
+msgstr "Dpkg-Protokoll wird nach »%s« geschrieben"
+
+#: ../unattended-upgrade:873
 #, c-format
 msgid "Initial blacklisted packages: %s"
 msgstr "Pakete, die anfangs auf die schwarzen Liste standen: %s"
 
-#: ../unattended-upgrade:514
+#: ../unattended-upgrade:875
 msgid "Starting unattended upgrades script"
 msgstr "Skript für unbeaufsichtigte Upgrades wird gestartet."
 
-#: ../unattended-upgrade:517
+#: ../unattended-upgrade:878
 #, c-format
 msgid "Allowed origins are: %s"
 msgstr "erlaubte Ursprünge sind: %s"
 
-#: ../unattended-upgrade:528 ../unattended-upgrade:529
+#: ../unattended-upgrade:891 ../unattended-upgrade:892
 msgid "Unclean dpkg state detected, trying to correct"
 msgstr "unsauberer Dpkg-Status entdeckt, es wird versucht dies zu korrigieren"
 
-#: ../unattended-upgrade:538
+#: ../unattended-upgrade:901
 #, c-format
 msgid ""
 "dpkg --configure -a output:\n"
@@ -126,102 +131,109 @@
 "»dpkg --configure -a«-Ausgabe:\n"
 "%s"
 
-#: ../unattended-upgrade:546
+#: ../unattended-upgrade:910
 msgid "Lock could not be acquired (another package manager running?)"
 msgstr ""
 "Sperrung konnte nicht erreicht werden (läuft eine weitere Paketverwaltung?)"
 
-#: ../unattended-upgrade:548
+#: ../unattended-upgrade:912
 msgid "Cache lock can not be acquired, exiting"
 msgstr "Zwischenspeicher konnte nicht gesperrt werden, wird beendet"
 
-#: ../unattended-upgrade:554 ../unattended-upgrade:555
+#: ../unattended-upgrade:919 ../unattended-upgrade:920
 msgid "Cache has broken packages, exiting"
 msgstr "Zwischenspeicher enthält beschädigte Pakete, wird beendet"
 
-#: ../unattended-upgrade:581
+#: ../unattended-upgrade:961
 #, c-format
 msgid "package '%s' upgradable but fails to be marked for upgrade (%s)"
 msgstr ""
 "Von Paket »%s« könnte ein Upgrade durchgeführt werden, es ist jedoch "
 "fehlgeschlagen, dies für das Upgrade zu markieren (%s)"
 
-#: ../unattended-upgrade:601
+#: ../unattended-upgrade:982
 #, c-format
 msgid "GetArchives() failed: '%s'"
 msgstr "GetArchives() fehlgeschlagen: »%s«"
 
-#: ../unattended-upgrade:610 ../unattended-upgrade:611
+#: ../unattended-upgrade:992 ../unattended-upgrade:993
 #, c-format
-msgid "An error ocured: '%s'"
+msgid "An error occurred: '%s'"
 msgstr "Es ist ein Fehler aufgetreten: »%s«"
 
-#: ../unattended-upgrade:613 ../unattended-upgrade:614
+#: ../unattended-upgrade:995 ../unattended-upgrade:997
 #, c-format
 msgid "The URI '%s' failed to download, aborting"
 msgstr "Herunterladen von der URI »%s« fehlgeschlagen, wird abgebrochen"
 
-#: ../unattended-upgrade:617
+#: ../unattended-upgrade:1001
 #, c-format
 msgid "Download finished, but file '%s' not there?!?"
 msgstr "Herunterladen beendet, aber Datei »%s« ist nicht dort!?"
 
-#: ../unattended-upgrade:626
+#: ../unattended-upgrade:1017 ../unattended-upgrade:1021
 #, c-format
 msgid "Package '%s' has conffile prompt and needs to be upgraded manually"
 msgstr ""
 "Das Paket »%s« hat eine Conffile-Abfrage und muss einem manuellen Upgrade "
 "unterzogen werden."
 
-#: ../unattended-upgrade:648
+#: ../unattended-upgrade:1044
 #, c-format
 msgid "package '%s' not upgraded"
 msgstr "Von Paket »%s« wurde kein Upgrade durchgeführt."
 
-#: ../unattended-upgrade:662
+#: ../unattended-upgrade:1059
 #, c-format
 msgid "Packages that are auto removed: '%s'"
 msgstr "Pakete, die automatisch entfernt wurden: »%s«"
 
-#: ../unattended-upgrade:669
+#: ../unattended-upgrade:1068
 msgid "No packages found that can be upgraded unattended"
 msgstr ""
 "Es wurden keine Pakete gefunden, von denen ein unbeaufsichtigtes Upgrade "
 "durchgeführt werden kann."
 
-#: ../unattended-upgrade:679
-#, c-format
-msgid "Packages that are upgraded: %s"
-msgstr "Pakete, von denen ein Upgrade durchgeführt wurde: %s"
-
-#: ../unattended-upgrade:693
-#, c-format
-msgid "Writing dpkg log to '%s'"
-msgstr "Dpkg-Protokoll wird nach »%s« geschrieben"
-
-#: ../unattended-upgrade:744
+#: ../unattended-upgrade:1088
+#, c-format
+msgid "Packages that will be upgraded: %s"
+msgstr "Pakete, von denen ein Upgrade durchgeführt wird: %s"
+
+#: ../unattended-upgrade:1125
 msgid "print debug messages"
 msgstr "Nachrichten zur Fehlersuche ausgeben"
 
-#: ../unattended-upgrade:747
+#: ../unattended-upgrade:1128
+msgid "make apt/libapt print verbose debug messages"
+msgstr "APT/LibAPT detaillierte Nachrichten zur Fehlersuche ausgeben lassen"
+
+#: ../unattended-upgrade:1131
+msgid "print info messages"
+msgstr "Informationsnachrichten ausgeben"
+
+#: ../unattended-upgrade:1134
 msgid "Simulation, download but do not install"
 msgstr "Simulation, herunterladen, aber nicht installieren"
 
-#: ../unattended-upgrade:750
+#: ../unattended-upgrade:1137
 msgid "Upgrade in minimal steps (and allow interrupting with SIGINT"
 msgstr "Upgrade in minimalen Schritten (Unterbrechung mit SIGINT erlaubt)"
 
-#: ../unattended-upgrade:754
+#: ../unattended-upgrade:1142
 msgid "You need to be root to run this application"
 msgstr "Sie müssen Root sein, um diese Anwendung auszuführen."
 
-#: ../unattended-upgrade-shutdown:95
+#: ../unattended-upgrade-shutdown:72
 msgid "Unattended-upgrade in progress during shutdown, sleeping for 5s"
 msgstr ""
 "Unattended-Upgrade läuft während des Herunterfahrens weiter, es wird fünf "
 "Sekunden lang gewartet."
 
-#: ../unattended-upgrade-shutdown:106
+#: ../unattended-upgrade-shutdown:125
+msgid "Running unattended-upgrades in shutdown mode"
+msgstr "Unattended-Upgrades im Herunterfahrmodus ausführen"
+
+#: ../unattended-upgrade-shutdown:153
 #, c-format
 msgid "Giving up on lockfile after %s delay"
 msgstr "Sperrdatei, hier wird nach %s Verzögerung aufgegeben."

=== modified file 'setup.py'
--- setup.py	2014-04-09 20:22:26 +0000
+++ setup.py	2014-10-15 08:16:16 +0000
@@ -28,6 +28,6 @@
                 ["debian/source_unattended-upgrades.py"])
         ],
         cmdclass={"build": build_extra.build_extra,
-                  "build_i18n":  build_i18n.build_i18n},
+                  "build_i18n": build_i18n.build_i18n},
         test_suite="test",
     )

=== modified file 'test/test_in_chroot.py'
--- test/test_in_chroot.py	2014-04-08 13:43:45 +0000
+++ test/test_in_chroot.py	2014-10-15 08:16:16 +0000
@@ -86,7 +86,8 @@
         # run it
         target = self._run_upgrade_test_in_real_chroot(options)
         # ensure we upgraded the expected packages
-        self.assertTrue(self._verify_install_log_in_real_chroot(target))
+        self.assertTrue(
+            self._verify_install_log_in_real_chroot(target, "ca-certificates"))
 
     def test_minimal_steps_upgrade(self):
         print("Running minimal steps unattended upgrade in chroot")
@@ -95,7 +96,8 @@
         # run it
         target = self._run_upgrade_test_in_real_chroot(options)
         # ensure we upgraded the expected packages
-        self.assertTrue(self._verify_install_log_in_real_chroot(target))
+        self.assertTrue(
+            self._verify_install_log_in_real_chroot(target, "ca-certificates"))
 
     def test_upgrade_on_shutdown_upgrade(self):
         print("Running unattended upgrade on shutdown (download and install) "
@@ -105,7 +107,45 @@
         os.environ["UNATTENDED_UPGRADES_FORCE_INSTALL_ON_SHUTDOWN"] = "1"
         apt.apt_pkg.config.set("Unattended-Upgrade::InstallOnShutdown", "1")
         target = self._run_upgrade_test_in_real_chroot(options)
-        self.assertTrue(self._verify_install_log_in_real_chroot(target))
+        self.assertTrue(
+            self._verify_install_log_in_real_chroot(target, "ca-certificates"))
+
+    def test_whitelist_upgrade(self):
+        print("Running unattended upgrade in chroot with whitelisted pkg")
+        options = MockOptions()
+        apt.apt_pkg.config.set(
+            "Unattended-Upgrade::Package-Whitelist::", "^libc6$")
+        # run it
+        target = self._run_upgrade_test_in_real_chroot(options)
+        # libc6 has a strict dependency on libc-bin so both packages
+        # will have to get installed. ensure that the relaxed whitelist is ok
+        self.assertTrue(
+            self._verify_install_log_in_real_chroot(target, "libc6"))
+        self.assertFalse(
+            self._verify_install_log_in_real_chroot(target, "ca-certificates"))
+        apt.apt_pkg.config.clear("Unattended-Upgrade::Package-Whitelist")
+
+    def test_whitelist_upgrade_strict(self):
+        print(
+            "Running unattended upgrade in chroot with strict whitelisted pkg")
+        options = MockOptions()
+        apt.apt_pkg.config.set(
+            "Unattended-Upgrade::Package-Whitelist::", "^apt$")
+        apt.apt_pkg.config.set(
+            "Unattended-Upgrade::Package-Whitelist::", "^libc6$")
+        apt.apt_pkg.config.set(
+            "Unattended-Upgrade::Package-Whitelist-Strict", "true")
+        # run it
+        target = self._run_upgrade_test_in_real_chroot(options)
+        # we upgraded apt, but not libc6 because libc6 needs libc-bin and
+        # its not whitelisted (in strict mode)
+        self.assertTrue(
+            self._verify_install_log_in_real_chroot(target, "apt"))
+        self.assertFalse(
+            self._verify_install_log_in_real_chroot(target, "libc6"))
+        self.assertFalse(
+            self._verify_install_log_in_real_chroot(target, "libc-bin"))
+        apt.apt_pkg.config.clear("Unattended-Upgrade::Package-Whitelist")
 
     def _get_lockfile_location(self, target):
         return os.path.join(
@@ -166,7 +206,7 @@
             apt.apt_pkg.config.clear("Unattended-Upgrade::Origins-Pattern")
             apt.apt_pkg.config.set(
                 "Unattended-Upgrade::Origins-Pattern::", ORIGINS_PATTERN)
-            unattended_upgrade.DISTRO_CODENAME = "lucid"
+            unattended_upgrade.DISTRO_CODENAME = DISTRO
             unattended_upgrade.main(options)
             os._exit(0)
         else:
@@ -196,16 +236,15 @@
         self.assertTrue(len(all_progress) > 5)
         return target
 
-    def _verify_install_log_in_real_chroot(self, target):
+    def _verify_install_log_in_real_chroot(self, target, needle_pkg):
         # examine log
         log = self._get_lockfile_location(target)
         logfile = open(log).read()
         #print(logfile)
-        NEEDLE_PKG = "ca-certificates"
-        if not re.search("Packages that will be upgraded:.*%s" % NEEDLE_PKG,
+        if not re.search("Packages that will be upgraded:.*%s" % needle_pkg,
                          logfile):
             logging.warn(
-                "Can not find expected %s upgrade in log" % NEEDLE_PKG)
+                "Can not find expected %s upgrade in log" % needle_pkg)
             return False
         if "ERROR Installing the upgrades failed" in logfile:
             logging.warn("Got a ERROR in the logfile")
@@ -213,9 +252,9 @@
         dpkg_log = os.path.join(
             target, "var/log/unattended-upgrades/*-dpkg*.log")
         dpkg_logfile = open(glob.glob(dpkg_log)[0]).read()
-        if not "Preparing to replace %s" % NEEDLE_PKG in dpkg_logfile:
+        if not "Preparing to replace %s" % needle_pkg in dpkg_logfile:
             logging.warn("Did not find %s upgrade in %s" % (
-                         dpkg_log, NEEDLE_PKG))
+                         dpkg_log, needle_pkg))
             return False
         #print(dpkg_logfile)
         return True

=== modified file 'test/test_origin_pattern.py'
--- test/test_origin_pattern.py	2013-04-11 04:59:50 +0000
+++ test/test_origin_pattern.py	2014-10-15 08:16:16 +0000
@@ -26,8 +26,10 @@
     pass
 
 
-class MockCache(list):
-    pass
+class MockCache(dict):
+    def __iter__(self):
+        for pkgname in self.keys():
+            yield self[pkgname]
 
 
 class MockDepCache():
@@ -101,23 +103,42 @@
             self.assertTrue(match_whitelist_string(s, None))
 
     def test_blacklist(self):
-        # mock pkg (yeah, complicated)
-        pkg = self._get_mock_package()
-        # mock cache
-        cache = MockCache()
-        cache._depcache = MockDepCache()
-        cache._depcache.broken_count = 0
-        cache.append(pkg)
+        # get the mocks
+        pkg = self._get_mock_package("linux-image")
+        cache = self._get_mock_cache()
+        cache[pkg.name] = pkg
         # origins and blacklist
         allowed_origins = ["o=Ubuntu"]
         blacklist = ["linux-.*"]
         # with blacklist pkg
         self.assertFalse(
-            check_changes_for_sanity(cache, allowed_origins, blacklist))
+            check_changes_for_sanity(cache, allowed_origins, blacklist, [".*"]))
         # with "normal" pkg
         pkg.name = "apt"
         self.assertTrue(
-            check_changes_for_sanity(cache, allowed_origins, blacklist))
+            check_changes_for_sanity(cache, allowed_origins, blacklist, [".*"]))
+
+    def test_whitelist_with_strict_whitelisting(self):
+        cache = self._get_mock_cache()
+        for pkgname in ["not-whitelisted", "whitelisted"]:
+            pkg = self._get_mock_package(name=pkgname)
+            cache[pkg.name] = pkg
+        # origins and blacklist
+        allowed_origins = ["o=Ubuntu"]
+        whitelist = ["whitelisted"]
+        # test with strict whitelist
+        apt_pkg.config.set(
+            "Unattended-Upgrades::Packages-Whitelist-Strict", "true")
+        # ensure that a not-whitelisted pkg will fail
+        self.assertTrue(cache["not-whitelisted"].marked_upgrade)
+        self.assertFalse(
+            check_changes_for_sanity(cache, allowed_origins, [], whitelist))
+
+    def _get_mock_cache(self):
+        cache = MockCache()
+        cache._depcache = MockDepCache()
+        cache._depcache.broken_count = 0
+        return cache
 
     def _get_mock_origin(self, aorigin="", label="", archive="",
                          site="", component=""):
@@ -129,11 +150,11 @@
         origin.compoent = component
         return origin
 
-    def _get_mock_package(self):
+    def _get_mock_package(self, name="foo"):
         pkg = MockPackage()
         pkg._pkg = MockPackage()
         pkg._pkg.selected_state = 0
-        pkg.name = "linux-image"
+        pkg.name = name
         pkg.marked_install = True
         pkg.marked_upgrade = True
         pkg.marked_delete = False

=== modified file 'test/test_pep8.py' (properties changed: +x to -x)
--- test/test_pep8.py	2013-09-12 20:31:54 +0000
+++ test/test_pep8.py	2014-10-15 08:16:16 +0000
@@ -2,6 +2,8 @@
 import subprocess
 import unittest
 
+IGNORE = "E265"
+
 
 class PackagePep8TestCase(unittest.TestCase):
 
@@ -11,8 +13,9 @@
             top_src_dir,
             os.path.join(top_src_dir, "unattended-upgrade"),
             os.path.join(top_src_dir, "unattended-upgrade-shutdown"),
-            ]
-        self.assertEqual(subprocess.call(["pep8", "--repeat", ] + targets), 0)
+        ]
+        self.assertEqual(subprocess.call(
+            ["pep8", "--repeat", "--ignore=%s" % IGNORE] + targets), 0)
 
 
 if __name__ == "__main__":

=== modified file 'test/test_pyflakes.py'
--- test/test_pyflakes.py	2013-09-12 20:25:37 +0000
+++ test/test_pyflakes.py	2014-10-15 08:16:16 +0000
@@ -12,7 +12,7 @@
             top_src_dir,
             os.path.join(top_src_dir, "unattended-upgrade"),
             os.path.join(top_src_dir, "unattended-upgrade-shutdown"),
-            ]
+        ]
         self.assertEqual(subprocess.call(["pyflakes", ] + targets), 0)
 
 

=== modified file 'unattended-upgrade'
--- unattended-upgrade	2014-09-11 13:12:05 +0000
+++ unattended-upgrade	2014-10-15 08:16:16 +0000
@@ -96,7 +96,9 @@
         """ Adjust candidate versions to match highest allowed origin
 
             This adjusts the origin even if the candidate has a higher
-            version
+            version. This is needed when e.g. a package is available in
+            the security pocket but there is also a package in the
+            updates pocket with a higher version number
         """
         for pkg in self:
             # important! this avoids downgrades below
@@ -110,9 +112,10 @@
             # not the candidate
             new_cand = None
             for ver in pkg.versions:
-                # ignore versions that the user marked with priority < 0
+                # ignore versions that the user marked with priority < 100
                 # (and ensure we have a python-apt that supports this)
-                if hasattr(ver, "policy_priority") and ver.policy_priority < 0:
+                if (hasattr(ver, "policy_priority") and
+                        ver.policy_priority < 100):
                     logging.debug("ignoring ver '%s' with priority < 0" % ver)
                     continue
                 if is_allowed_origin(ver, self.allowed_origins):
@@ -364,8 +367,8 @@
             raise UnknownMatcherError(
                 "Unknown whitelist entry for macher '%s' (token '%s')" % (
                     what, token))
-        logging.debug("matching '%s'='%s' against '%s'" % (
-                      what, value, origin))
+        #logging.debug("matching '%s'='%s' against '%s'" % (
+        #              what, value, origin))
     return res
 
 
@@ -391,7 +394,7 @@
 
 
 def upgrade_in_minimal_steps(cache, pkgs_to_upgrade, blacklist,
-                             logfile_dpkg="", verbose=False):
+                             whitelist, logfile_dpkg="", verbose=False):
 
     install_log = LogInstallProgress(logfile_dpkg, verbose)
     install_log.progress_log += ".minimal-steps"
@@ -420,7 +423,8 @@
                 continue
             # double check that we are not running into side effects like
             # what could have been caused LP: #1020680
-            if not check_changes_for_sanity(cache, allowed_origins, blacklist):
+            if not check_changes_for_sanity(cache, allowed_origins, blacklist,
+                                            whitelist):
                 logging.info("While building minimal partition: "
                              "cache has not allowed changes")
                 cache.clear()
@@ -491,8 +495,19 @@
             return True
     return False
 
-
-def check_changes_for_sanity(cache, allowed_origins, blacklist):
+def is_pkgname_in_whitelist(pkgname, whitelist):
+    # a empty whitelist means the user does not want to use this feature
+    if not whitelist:
+        return True
+    for whitelist_regexp in whitelist:
+        if re.match(whitelist_regexp, pkgname):
+            logging.debug("only upgrading the following package '%s'" %
+                          pkgname)
+            return True
+    return False
+
+
+def check_changes_for_sanity(cache, allowed_origins, blacklist, whitelist):
     if cache._depcache.broken_count != 0:
         return False
     for pkg in cache:
@@ -504,6 +519,19 @@
                 logging.debug("pkg '%s' not in allowed origin" % pkg.name)
                 return False
             if is_pkgname_in_blacklist(pkg.name, blacklist):
+                logging.debug("pkg '%s' package has been blacklisted" %
+                              pkg.name)
+                return False
+            # a strict whitelist will not allow any changes not in the 
+            # whitelist, most people will want the relaxed whitelist
+            # that whitelists a package but pulls in the package 
+            # dependencies
+            strict_whitelist = apt_pkg.config.find_b(
+                "Unattended-Upgrade::Package-Whitelist-Strict", False)
+            if (strict_whitelist and
+                not is_pkgname_in_whitelist(pkg.name, whitelist)):
+                logging.debug("pkg '%s' package is not whitelisted" %
+                              pkg.name)
                 return False
             if pkg._pkg.selected_state == apt_pkg.SELSTATE_HOLD:
                 logging.debug("pkg '%s' is on hold" % pkg.name)
@@ -595,7 +623,7 @@
         # might be a dpkg prompt (LP: #936870)
         if md5 == "newconffile":
             continue
-        if not pkg_conffiles or not conf_file in pkg_conffiles.split("\n"):
+        if not pkg_conffiles or conf_file not in pkg_conffiles.split("\n"):
             logging.debug("'%s' not in package conffiles '%s'" % (
                 conf_file, pkg_conffiles))
             continue
@@ -625,7 +653,7 @@
     # in the previous version in the dpkg status file
     if pkg_conffiles:
         for conf_file in pkg_conffiles.split("\n"):
-            if (not conf_file in dpkg_status_conffiles and
+            if (conf_file not in dpkg_status_conffiles and
                     os.path.exists(prefix + conf_file)):
                 logging.debug("found conffile '%s' in new pkg but on dpkg "
                               "status" % conf_file)
@@ -637,7 +665,7 @@
 
 
 def dpkg_conffile_prompt():
-    if not "DPkg::Options" in apt_pkg.config:
+    if "DPkg::Options" not in apt_pkg.config:
         return True
     options = apt_pkg.config.value_list("DPkg::Options")
     for option in options:
@@ -693,7 +721,7 @@
     # ascii only system like the buildds)
     mail = subprocess.Popen(
         [MAIL_BINARY, "-s", subject, to_address],
-        stdin=subprocess.PIPE,  universal_newlines=False)
+        stdin=subprocess.PIPE, universal_newlines=False)
     mail.stdin.write(encoded_body)
     mail.stdin.close()
     ret = mail.wait()
@@ -778,14 +806,20 @@
     logging.debug("mail returned: %s" % ret)
 
 
-def do_install(cache, pkgs_to_upgrade, blacklisted_pkgs, options,
-               logfile_dpkg):
+def do_install(cache, pkgs_to_upgrade, blacklisted_pkgs, whitelisted_pkgs,
+               options, logfile_dpkg):
     # set debconf to NON_INTERACTIVE, redirect output
     os.putenv("DEBIAN_FRONTEND", "noninteractive")
     setup_apt_listchanges()
 
     logging.info(_("Writing dpkg log to '%s'") % logfile_dpkg)
 
+    marked_delete = [pkg for pkg in cache.get_changes() if pkg.marked_delete]
+    if marked_delete:
+        raise AssertionError(
+            "Internal error. The following packages are marked for "
+            "removal:%s" % "".join([pkg.name for pkg in marked_delete]))
+
     pkg_install_success = False
     try:
         if (options.minimal_upgrade_steps or
@@ -801,7 +835,7 @@
             # try upgrade all "pkgs" in minimal steps
             pkg_install_success = upgrade_in_minimal_steps(
                 cache, [pkg.name for pkg in pkgs_to_upgrade],
-                blacklisted_pkgs, logfile_dpkg,
+                blacklisted_pkgs, whitelisted_pkgs, logfile_dpkg,
                 options.verbose or options.debug)
         else:
             pkg_install_success = upgrade_normal(
@@ -855,7 +889,6 @@
             # COMPAT only
             apt_pkg.config.find("APT::UnattendedUpgrades::LogFile",
                                 "unattended-upgrades.log")))
-
     if not options.dry_run and not os.path.exists(logdir):
         os.makedirs(logdir)
 
@@ -886,6 +919,10 @@
     return apt_pkg.config.value_list("Unattended-Upgrade::Package-Blacklist")
 
 
+def get_whitelisted_pkgs():
+    return apt_pkg.config.value_list("Unattended-Upgrade::Package-Whitelist")
+
+
 def reboot_if_requested_and_needed(shutdown_lock=0):
     # auto-reboot (if required and the config for this is set
     if (apt_pkg.config.find_b(
@@ -906,43 +943,57 @@
         pass
 
 
+def try_to_upgrade(pkg, pkgs_to_upgrade, pkgs_kept_back, cache, allowed_origins,
+                     blacklisted_pkgs, whitelisted_pkgs):
+
+    try:
+        pkg.mark_upgrade()
+        if check_changes_for_sanity(cache, allowed_origins,
+                                    blacklisted_pkgs, whitelisted_pkgs):
+            # add to packages to upgrade
+            pkgs_to_upgrade.append(pkg)
+            # re-eval pkgs_kept_back as the resolver may fail to
+            # directly upgrade a pkg, but that may work during
+            # a subsequent operation, see debian bug #639840
+            for pkgname in pkgs_kept_back:
+                if (cache[pkgname].marked_install or
+                        cache[pkgname].marked_upgrade):
+                    pkgs_kept_back.remove(pkgname)
+                    pkgs_to_upgrade.append(cache[pkgname])
+        else:
+            logging.debug("sanity check failed")
+            rewind_cache(cache, pkgs_to_upgrade)
+            pkgs_kept_back.append(pkg.name)
+    except SystemError as e:
+        # can't upgrade
+        logging.warning(
+            _("package '%s' upgradable but fails to "
+                "be marked for upgrade (%s)") % (pkg.name, e))
+        rewind_cache(cache, pkgs_to_upgrade)
+        pkgs_kept_back.append(pkg.name)
+
+
 def calculate_upgradable_pkgs(cache, options, allowed_origins,
-                              blacklisted_pkgs):
+                              blacklisted_pkgs, whitelisted_pkgs):
     pkgs_to_upgrade = []
     pkgs_kept_back = []
+
     # now do the actual upgrade
     for pkg in cache:
         if options.debug and pkg.is_upgradable:
             logging.debug("Checking: %s (%s)" % (
                 pkg.name, getattr(pkg.candidate, "origins", [])))
         if (pkg.is_upgradable and
-                not is_pkgname_in_blacklist(pkg.name, blacklisted_pkgs) and
-                is_allowed_origin(pkg.candidate, allowed_origins)):
-            try:
-                pkg.mark_upgrade()
-                if check_changes_for_sanity(cache, allowed_origins,
-                                            blacklisted_pkgs):
-                    # add to packages to upgrade
-                    pkgs_to_upgrade.append(pkg)
-                    # re-eval pkgs_kept_back as the resolver may fail to
-                    # directly upgrade a pkg, but that may work during
-                    # a subsequent operation, see debian bug #639840
-                    for pkgname in pkgs_kept_back:
-                        if (cache[pkgname].marked_install or
-                                cache[pkgname].marked_upgrade):
-                            pkgs_kept_back.remove(pkgname)
-                            pkgs_to_upgrade.append(cache[pkgname])
-                else:
-                    logging.debug("sanity check failed")
-                    rewind_cache(cache, pkgs_to_upgrade)
-                    pkgs_kept_back.append(pkg.name)
-            except SystemError as e:
-                # can't upgrade
-                logging.warning(
-                    _("package '%s' upgradable but fails to "
-                      "be marked for upgrade (%s)") % (pkg.name, e))
-                rewind_cache(cache, pkgs_to_upgrade)
-                pkgs_kept_back.append(pkg.name)
+              not is_pkgname_in_blacklist(pkg.name, blacklisted_pkgs) and
+              is_pkgname_in_whitelist(pkg.name, whitelisted_pkgs) and
+              is_allowed_origin(pkg.candidate, allowed_origins)):
+            try_to_upgrade(pkg,
+                           pkgs_to_upgrade,
+                           pkgs_kept_back,
+                           cache,
+                           allowed_origins,
+                           blacklisted_pkgs,
+                           whitelisted_pkgs)
     return pkgs_to_upgrade, pkgs_kept_back
 
 
@@ -958,10 +1009,16 @@
     # format (origin, archive), e.g. ("Ubuntu","dapper-security")
     allowed_origins = get_allowed_origins()
 
-    # pkgs that are (for some reason) not save to install
+    # pkgs that are (for some reason) not safe to install
     blacklisted_pkgs = get_blacklisted_pkgs()
     logging.info(_("Initial blacklisted packages: %s"),
                  " ".join(blacklisted_pkgs))
+
+    # install only these packages regardless of other upgrades available
+    whitelisted_pkgs = get_whitelisted_pkgs()
+    logging.info(_("Initial whitelisted packages: %s"),
+                 " ".join(whitelisted_pkgs))
+
     logging.info(_("Starting unattended upgrades script"))
 
     # display available origin
@@ -1025,7 +1082,7 @@
                                if pkg.is_auto_removable])
     # find out about the packages that are upgradable (in a allowed_origin)
     pkgs_to_upgrade, pkgs_kept_back = calculate_upgradable_pkgs(
-        cache, options, allowed_origins, blacklisted_pkgs)
+        cache, options, allowed_origins, blacklisted_pkgs, whitelisted_pkgs)
     pkgs_to_upgrade.sort(key=lambda p: p.name)
     pkgs = "\n".join([pkg.name for pkg in pkgs_to_upgrade])
     logging.debug("pkgs that look like they should be upgraded: %s" % pkgs)
@@ -1094,16 +1151,19 @@
         # redo the selection about the packages to upgrade based on the new
         # blacklist
         logging.debug("blacklist: %s" % blacklisted_pkgs)
+        # whitelist
+        logging.debug("whitelist: %s" % whitelisted_pkgs)
         # find out about the packages that are upgradable (in a allowed_origin)
-        if len(blacklisted_pkgs) > 0:
+        if len(blacklisted_pkgs) > 0 or len(whitelisted_pkgs) > 0:
             cache.clear()
             old_pkgs_to_upgrade = pkgs_to_upgrade[:]
             pkgs_to_upgrade = []
             for pkg in old_pkgs_to_upgrade:
-                logging.debug("Checking (blacklist): %s" % (pkg.name))
+                logging.debug("Checking the black and whitelist: %s" %
+                              (pkg.name))
                 pkg.mark_upgrade()
                 if check_changes_for_sanity(cache, allowed_origins,
-                                            blacklisted_pkgs):
+                                            blacklisted_pkgs, whitelisted_pkgs):
                     pkgs_to_upgrade.append(pkg)
                 else:
                     if not (pkg.name in pkgs_kept_back):
@@ -1140,7 +1200,7 @@
     # check if its configured for install on shutdown, if so, the
     # environment UNATTENDED_UPGRADES_FORCE_INSTALL_ON_SHUTDOWN will
     # be set by the unatteded-upgrades-shutdown script
-    if (not "UNATTENDED_UPGRADES_FORCE_INSTALL_ON_SHUTDOWN" in os.environ and
+    if ("UNATTENDED_UPGRADES_FORCE_INSTALL_ON_SHUTDOWN" not in os.environ and
             apt_pkg.config.find_b(
                 "Unattended-Upgrade::InstallOnShutdown", False)):
         logger = logging.getLogger()
@@ -1157,7 +1217,6 @@
     logging.info(_("Packages that will be upgraded: %s" % pkgs))
 
     # get log
-    now = datetime.datetime.now()
     logfile_dpkg = os.path.join(_get_logdir(), 'unattended-upgrades-dpkg.log')
 
     # only perform install step if we actually have packages to install
@@ -1169,7 +1228,7 @@
         shutdown_lock = apt_pkg.get_lock("/var/run/unattended-upgrades.lock")
         # do install
         pkg_install_success = do_install(
-            cache, pkgs_to_upgrade, blacklisted_pkgs, options, logfile_dpkg)
+            cache, pkgs_to_upgrade, blacklisted_pkgs, whitelisted_pkgs, options, logfile_dpkg)
 
     # send a mail (if needed)
     if not options.dry_run:
@@ -1193,7 +1252,7 @@
 
     # this ensures the commandline is logged in /var/log/apt/history.log
     apt_pkg.config.set("Commandline::AsString", " ".join(sys.argv))
- 
+
     # init the options
     parser = OptionParser()
     parser.add_option("-d", "--debug",

=== modified file 'unattended-upgrade-shutdown'
--- unattended-upgrade-shutdown	2013-09-12 20:28:39 +0000
+++ unattended-upgrade-shutdown	2014-10-15 08:16:16 +0000
@@ -149,7 +149,7 @@
         # show log
         log_progress()
         time.sleep(5)
-        if (time.time() - start_time) > options.delay*60:
+        if (time.time() - start_time) > options.delay * 60:
             logging.warning(_("Giving up on lockfile after %s delay") %
                             options.delay)
             sys.exit(1)