aboutsummaryrefslogtreecommitdiff
path: root/ruby
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-02 02:19:01 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-07 11:32:55 +0000
commit20cc98f89f0208619fa8845d784463f03a7c9234 (patch)
tree11872e31117810463923d4fccb0a955e061e9262 /ruby
parentd02f6611a083735106d0f56d6d49f3a4743a5d07 (diff)
downloadpaludis-20cc98f89f0208619fa8845d784463f03a7c9234.tar.gz
paludis-20cc98f89f0208619fa8845d784463f03a7c9234.tar.xz
Share more common metadata
Diffstat (limited to 'ruby')
-rw-r--r--ruby/package_id.cc10
-rw-r--r--ruby/package_id_TEST.rb4
2 files changed, 7 insertions, 7 deletions
diff --git a/ruby/package_id.cc b/ruby/package_id.cc
index edaef2ca1..71dab061f 100644
--- a/ruby/package_id.cc
+++ b/ruby/package_id.cc
@@ -2,7 +2,7 @@
/*
* Copyright (c) 2007, 2008 Richard Brown
- * Copyright (c) 2007, 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -463,12 +463,12 @@ namespace
static VALUE
fetch(VALUE self)
{
- std::shared_ptr<const PackageID> * self_ptr;
- Data_Get_Struct(self, std::shared_ptr<const PackageID>, self_ptr);
- std::shared_ptr<const MetadataKey> ptr = (((**self_ptr).*m_)());
-
try
{
+ std::shared_ptr<const PackageID> * self_ptr;
+ Data_Get_Struct(self, std::shared_ptr<const PackageID>, self_ptr);
+ std::shared_ptr<const MetadataKey> ptr = (((**self_ptr).*m_)());
+
if (ptr)
{
return metadata_key_to_value(((**self_ptr).*m_)());
diff --git a/ruby/package_id_TEST.rb b/ruby/package_id_TEST.rb
index 95e9b88ab..169adc23c 100644
--- a/ruby/package_id_TEST.rb
+++ b/ruby/package_id_TEST.rb
@@ -332,8 +332,8 @@ module Paludis
end
end
- def test_build_dependenciess_key
- assert_raise RuntimeError do
+ def test_build_dependencies_key
+ assert_raise NameError do
pid_bad.build_dependencies_key.value
end
end