[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

James Turnbull james at lovedthanlost.net
Fri Jan 15 09:07:42 UTC 2010


The following commit has been merged in the upstream branch:
commit c2617211cf5037c5ddb7f59992c35c6dd62a529e
Author: Markus Roberts <Markus at reality.com>
Date:   Fri Dec 11 15:25:00 2009 -0800

    Fix for #2911 (Allow capital letters in selinux contexts)
    
    This is Matthias Saou's patch from the ticket; it adjusts the regular
    expression to permit capital letters where needed.

diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb
index 3eff039..f1336f9 100644
--- a/lib/puppet/util/selinux.rb
+++ b/lib/puppet/util/selinux.rb
@@ -73,7 +73,7 @@ module Puppet::Util::SELinux
         if context.nil? or context == "unlabeled"
             return nil
         end
-        unless context =~ /^([a-z0-9_]+):([a-z0-9_]+):([a-z0-9_]+)(?::([a-zA-Z0-9:,._-]+))?/
+        unless context =~ /^([a-z0-9_]+):([a-z0-9_]+):([a-zA-Z0-9_]+)(?::([a-zA-Z0-9:,._-]+))?/
             raise Puppet::Error, "Invalid context to parse: #{context}"
         end
         ret = {

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list