#2332: Remove trailing slashes from path commands in the plugin

2 files changed, 7 insertions, 0 deletions

diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb
index b65a41e78..d1408d1da 100644
--- a/lib/puppet/provider/augeas/augeas.rb
+++ b/lib/puppet/provider/augeas/augeas.rb
@@ -91,6 +91,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
                     unless p = sc.string[start, len]
                         fail("missing path argument #{narg} for #{cmd}")
                     end
+                    p.chomp!("/")
                     if p[0,1] != "$" && p[0,1] != "/"
                         argline << context + p
                     else
diff --git a/spec/unit/provider/augeas/augeas.rb b/spec/unit/provider/augeas/augeas.rb
index 147660f37..1ba614685 100644
--- a/spec/unit/provider/augeas/augeas.rb
+++ b/spec/unit/provider/augeas/augeas.rb
@@ -127,6 +127,12 @@ describe provider_class do
             tokens = @provider.parse_commands(args.join(" \t "))
             tokens.should == [ args ]
         end
+
+        it "should remove trailing slashes" do
+            @resource.stubs(:[]).returns("/foo/")
+            tokens = @provider.parse_commands("set foo/ bar")
+            tokens.should == [[ "set", "/foo/foo", "bar" ]]
+        end
     end
 
     describe "get filters" do