From 91dbb191bc8d4a1dfbf2e49447cc7dc10e739858da171fa384e03acbea058ac4 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 12 Oct 2010 19:09:21 +0000 Subject: [PATCH] Accepting request 50417 from home:elvigia:branches:Base:System Ok, thanks. OBS-URL: https://build.opensuse.org/request/show/50417 OBS-URL: https://build.opensuse.org/package/show/Base:System/acpid?expand=0&rev=11 --- acpid-2.0.6-event-skip-messages.patch | 15 +++++++++++++++ acpid.changes | 10 ++++++++++ acpid.spec | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 acpid-2.0.6-event-skip-messages.patch diff --git a/acpid-2.0.6-event-skip-messages.patch b/acpid-2.0.6-event-skip-messages.patch new file mode 100644 index 0000000..29072de --- /dev/null +++ b/acpid-2.0.6-event-skip-messages.patch @@ -0,0 +1,15 @@ +--- event.c.orig ++++ event.c +@@ -124,8 +124,11 @@ acpid_read_conf(const char *confdir) + + /* skip any files that don't match the run-parts convention */ + if (regexec(&preg, dirent->d_name, 0, NULL, 0) != 0) { +- acpid_log(LOG_INFO, "skipping conf file %s/%s\n", ++ if(strcmp(dirent->d_name, ".") != 0 && ++ strcmp(dirent->d_name, "..") != 0) { ++ acpid_log(LOG_INFO, "skipping conf file %s/%s\n", + confdir, dirent->d_name); ++ } + continue; + } + diff --git a/acpid.changes b/acpid.changes index 4846267..a89aa6b 100644 --- a/acpid.changes +++ b/acpid.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Oct 12 18:51:58 UTC 2010 - cristian.rodriguez@opensuse.org + +- fix logic + +------------------------------------------------------------------- +Tue Oct 12 15:28:20 UTC 2010 - cristian.rodriguez@opensuse.org + +- Do not warn on "skipping .. and ." directory entries + ------------------------------------------------------------------- Sat Oct 2 19:49:08 UTC 2010 - aj@suse.de diff --git a/acpid.spec b/acpid.spec index 61f4274..d714980 100644 --- a/acpid.spec +++ b/acpid.spec @@ -38,6 +38,7 @@ Source7: power_button Source8: acpid.service Patch1: acpid-makefile.patch Patch2: acpid-2.0.5-forking.patch +Patch3: acpid-2.0.6-event-skip-messages.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 @@ -62,6 +63,7 @@ Authors: %setup -q %patch1 -p0 %patch2 -p1 +%patch3 cp %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:9} . %build