← Back to branch summary

~mvo/unattended-upgrades/fix-on-error-mail

« back to all changes in this revision

Viewing changes to unattended-upgrade

  • Committer: Michael Vogt
  • Date: 2013-03-14 08:19:24 UTC
  • mfrom: (252.2.5 debian-experimental)
  • Revision ID: michael.vogt@ubuntu.com-20130314081924-kfoef52dyykovuvb
merged experimental branch (that is not really experimental)

Show diffs side-by-side

added added

removed removed

Lines of Context:
unattended-upgrade
283
283
        # strip and unquote the "," back
284
284
        (what, value) = [s.strip().replace("%2C",",")
285
285
                         for s in token.split("=")]
 
286
        # support substitution here as well
 
287
        value = substitute(value)
286
288
        #logging.debug("matching '%s'='%s' against '%s'" % (what, value, origin))
287
289
        # first char is apt-cache policy output, send is the name
288
290
        # in the Release file
296
298
            res &= (value == origin.component)
297
299
        elif what in ("site",):
298
300
            res &= (value == origin.site)
 
301
        elif what in ("n", "codename",):
 
302
            res &= (value == origin.codename)
299
303
        else:
300
304
            raise UnknownMatcherError(
301
305
                "Unknown whitelist entry for macher '%s' (token '%s')" % (