summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-02-26 17:04:16 -0500
committerLuke Kanies <luke@madstop.com>2008-02-26 17:04:16 -0500
commit4e559994a3f4a7d4af367dceb5d037ae07dca7d7 (patch)
tree3eae5bc702112e066a426c4aa5749feb7c7f3ad8
parent42bfdf2fc7affa91265043e583c9673b738d22dd (diff)
downloadpuppet-4e559994a3f4a7d4af367dceb5d037ae07dca7d7.tar.gz
puppet-4e559994a3f4a7d4af367dceb5d037ae07dca7d7.tar.xz
puppet-4e559994a3f4a7d4af367dceb5d037ae07dca7d7.zip
Removing the validation on package sources, since
some platforms (e.g., hpux) do not have a well-formed requirement for the source.
-rw-r--r--lib/puppet/type/package.rb8
-rwxr-xr-xspec/unit/ral/types/package.rb4
2 files changed, 2 insertions, 10 deletions
diff --git a/lib/puppet/type/package.rb b/lib/puppet/type/package.rb
index ee2871ce2..f004f7c42 100644
--- a/lib/puppet/type/package.rb
+++ b/lib/puppet/type/package.rb
@@ -211,14 +211,6 @@ module Puppet
desc "Where to find the actual package. This must be a local file
(or on a network file system) or a URL that your specific
packaging type understands; Puppet will not retrieve files for you."
-
- validate do |value|
- unless value =~ /^#{File::SEPARATOR}/ or value =~ /\w+:\/\//
- self.fail(
- "Package sources must be fully qualified files or URLs, depending on the platform."
- )
- end
- end
end
newparam(:instance) do
desc "A read-only parameter set by the package."
diff --git a/spec/unit/ral/types/package.rb b/spec/unit/ral/types/package.rb
index 785d2eb37..5d96dc4ae 100755
--- a/spec/unit/ral/types/package.rb
+++ b/spec/unit/ral/types/package.rb
@@ -94,8 +94,8 @@ describe Puppet::Type::Package, "when validating attribute values" do
proc { Puppet::Type::Package.create(:name => "yay", :ensure => "1.0") }.should raise_error(Puppet::Error)
end
- it "should only accept files and URLs as values to :source" do
- proc { Puppet::Type::Package.create(:name => "yay", :source => "stuff") }.should raise_error(Puppet::Error)
+ it "should accept any string as an argument to :source" do
+ proc { Puppet::Type::Package.create(:name => "yay", :source => "stuff") }.should_not raise_error(Puppet::Error)
end
after { Puppet::Type::Package.clear }