summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-ruby/uuidtools/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-ruby/uuidtools/files')
-rw-r--r--dev-ruby/uuidtools/files/uuidtools-2.1.2-macaddress.patch71
1 files changed, 71 insertions, 0 deletions
diff --git a/dev-ruby/uuidtools/files/uuidtools-2.1.2-macaddress.patch b/dev-ruby/uuidtools/files/uuidtools-2.1.2-macaddress.patch
new file mode 100644
index 000000000000..b5ebbc41f174
--- /dev/null
+++ b/dev-ruby/uuidtools/files/uuidtools-2.1.2-macaddress.patch
@@ -0,0 +1,71 @@
+From d29566188211e5511efece9319c524f7a278655c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Tue, 10 Jul 2012 01:18:34 -0700
+Subject: [PATCH] specs: do not fail tests if MAC address can't be fetched.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It's very well possible that depending on the capabilities of the
+process (and user) running the specs, the MAC address is not
+available. In this case, do not fail tests, simply skip over those if
+the mac address is unset.
+
+Solves issue #12.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ spec/uuidtools/mac_address_spec.rb | 6 +-----
+ spec/uuidtools/uuid_creation_spec.rb | 2 +-
+ spec/uuidtools/uuid_parsing_spec.rb | 2 +-
+ 3 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/spec/uuidtools/mac_address_spec.rb b/spec/uuidtools/mac_address_spec.rb
+index 987ae36..f0ee146 100644
+--- a/spec/uuidtools/mac_address_spec.rb
++++ b/spec/uuidtools/mac_address_spec.rb
+@@ -1,14 +1,10 @@
+ require File.expand_path("../../spec_helper.rb", __FILE__)
+
+-describe UUIDTools::UUID, "when obtaining a MAC address" do
++describe UUIDTools::UUID, "when obtaining a MAC address", :unless => UUIDTools::UUID.mac_address.nil? do
+ before do
+ @mac_address = UUIDTools::UUID.mac_address
+ end
+
+- it "should obtain a MAC address" do
+- @mac_address.should_not be_nil
+- end
+-
+ it "should cache the MAC address" do
+ @mac_address.object_id.should == UUIDTools::UUID.mac_address.object_id
+ end
+diff --git a/spec/uuidtools/uuid_creation_spec.rb b/spec/uuidtools/uuid_creation_spec.rb
+index 6f6b497..45b78a2 100644
+--- a/spec/uuidtools/uuid_creation_spec.rb
++++ b/spec/uuidtools/uuid_creation_spec.rb
+@@ -13,7 +13,7 @@ describe UUIDTools::UUID, "when generating" do
+ ).to_s.should == "15074785-9071-3fe3-89bd-876e4b9e919b"
+ end
+
+- it "should correctly generate timestamp variant UUIDs" do
++ it "should correctly generate timestamp variant UUIDs", :unless => UUIDTools::UUID.mac_address.nil? do
+ UUIDTools::UUID.timestamp_create.should_not be_random_node_id
+ UUIDTools::UUID.timestamp_create.to_s.should_not ==
+ UUIDTools::UUID.timestamp_create.to_s
+diff --git a/spec/uuidtools/uuid_parsing_spec.rb b/spec/uuidtools/uuid_parsing_spec.rb
+index 56cfeee..fcfafeb 100644
+--- a/spec/uuidtools/uuid_parsing_spec.rb
++++ b/spec/uuidtools/uuid_parsing_spec.rb
+@@ -23,7 +23,7 @@ describe UUIDTools::UUID, "when parsing" do
+ UUIDTools::UUID.timestamp_create.should_not be_nil_uuid
+ end
+
+- it "should not treat a timestamp version UUID as a random node UUID" do
++ it "should not treat a timestamp version UUID as a random node UUID", :unless => UUIDTools::UUID.mac_address.nil? do
+ UUIDTools::UUID.timestamp_create.should_not be_random_node_id
+ end
+
+--
+1.7.8.6
+