This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 090e421172e56743af36a4f3e734b8b60e4e0b0c (commit) from 512d54a98f02dbed4bd67c73dad0c318d8831f8c (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 090e421172e56743af36a4f3e734b8b60e4e0b0c Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jan 18 19:18:41 2011 +0100

fireinfo: Fix hash collision because of very weird UUID.

-----------------------------------------------------------------------

Summary of changes: lfs/fireinfo | 4 ++++ src/patches/fireinfo-invalid-id.patch | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) create mode 100644 src/patches/fireinfo-invalid-id.patch

Difference in files: diff --git a/lfs/fireinfo b/lfs/fireinfo index abc9d84..97b5a87 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -70,6 +70,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + # Fix for braindead board vendors. + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-invalid-id.patch + cd $(DIR_APP) && python setup.py build cd $(DIR_APP) && python setup.py install

diff --git a/src/patches/fireinfo-invalid-id.patch b/src/patches/fireinfo-invalid-id.patch new file mode 100644 index 0000000..669deb6 --- /dev/null +++ b/src/patches/fireinfo-invalid-id.patch @@ -0,0 +1,18 @@ +commit ac68f90a0229083d755e7e2e8980822405ac2da8 +Author: Michael Tremer michael.tremer@ipfire.org +Date: Tue Jan 18 19:11:06 2011 +0100 + + Add invalid ID: 00020003-0004-0005-0006-000700080009. + +diff --git a/fireinfo/system.py b/fireinfo/system.py +index 135c29b..690eae2 100644 +--- a/fireinfo/system.py ++++ b/fireinfo/system.py +@@ -41,6 +41,7 @@ INVALID_ID_STRINGS = ( + "N/A", "n/a", + "12345", "54321", "202020", + "Chassis", "chassis", ++ "00020003-0004-0005-0006-000700080009", + ) + + class Singleton(type):

hooks/post-receive -- IPFire 2.x development tree