[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. f2afa8c7a0c7d83a533d635effa1264ed9f50f87

[Thom May]

The branch, master has been updated
       via  f2afa8c7a0c7d83a533d635effa1264ed9f50f87 (commit)
       via  886982a02b120078b8d4680cc3ce54a8a7e482fb (commit)
      from  54cac61b82b555d98d6af802ae2fae93b1900fc9 (commit)


- Shortlog ------------------------------------------------------------
f2afa8c * Apply patch for puppet#1003 to enable collection of tagged resources
886982a * Set rundir correctly (Closes: #460203, #459579)

Summary of changes:
 debian/changelog               |    7 +++++++
 debian/puppet.conf             |    1 +
 lib/puppet/parser/collector.rb |    2 +-
 3 files changed, 9 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit f2afa8c7a0c7d83a533d635effa1264ed9f50f87
Author: Thom May <thom at ubuntu.com>
Date:   Fri Jan 11 12:04:20 2008 +0100

    * Apply patch for puppet#1003 to enable collection of tagged resources

diff --git a/debian/changelog b/debian/changelog
index 9870bcd..ee2bbaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 puppet (0.24.1-2) UNRELEASED; urgency=low
 
   * Set rundir correctly (Closes: #460203, #459579)
+  * Apply patch for puppet#1003 to enable collection of tagged resources
 
  -- Thom May <thom at debian.org>  Fri, 11 Jan 2008 12:00:32 +0100
 
diff --git a/lib/puppet/parser/collector.rb b/lib/puppet/parser/collector.rb
index b8165a8..ec57b0d 100644
--- a/lib/puppet/parser/collector.rb
+++ b/lib/puppet/parser/collector.rb
@@ -51,7 +51,7 @@ class Puppet::Parser::Collector
         search = "(exported=? AND restype=?)"
         values = [true, @type]
 
-        search += " AND (?)" and values << @equery if @equery
+        search += " AND (%s)" % @equery if @equery
 
         # We're going to collect objects from rails, but we don't want any
         # objects from this host.

commit 886982a02b120078b8d4680cc3ce54a8a7e482fb
Author: Thom May <thom at ubuntu.com>
Date:   Fri Jan 11 12:01:41 2008 +0100

    * Set rundir correctly (Closes: #460203, #459579)

diff --git a/debian/changelog b/debian/changelog
index 3ad43e3..9870bcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+puppet (0.24.1-2) UNRELEASED; urgency=low
+
+  * Set rundir correctly (Closes: #460203, #459579)
+
+ -- Thom May <thom at debian.org>  Fri, 11 Jan 2008 12:00:32 +0100
+
 puppet (0.24.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #445626)
diff --git a/debian/puppet.conf b/debian/puppet.conf
index e17d039..c541c74 100644
--- a/debian/puppet.conf
+++ b/debian/puppet.conf
@@ -2,6 +2,7 @@
 logdir=/var/log/puppet
 vardir=/var/lib/puppet
 ssldir=/var/lib/puppet/ssl
+rundir=/var/run/puppet
 
 [puppetmasterd]
 templatedir=/var/lib/puppet/templates

-- 
Puppet packaging for Debian