diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 11:26:18 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 11:26:18 -0300 |
commit | 01dfa0016c313f5ec5be0a8b624bac5031ff74a8 (patch) | |
tree | 6dfcf9c3c4143226d0ef65ce2d139f80f8fcacc1 /core/util-linux/dmesg-space.patch | |
parent | 40e1222c1402c0d2aded73b95802f8197d0691a6 (diff) | |
parent | 9343f37ee7ba1aa98f65272412d331a280890e12 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/epdfview/PKGBUILD
community/gpa/PKGBUILD
community/gtk2hs-cairo/PKGBUILD
community/gtk2hs-glib/PKGBUILD
community/gtk2hs-gtk/PKGBUILD
community/gtk2hs-pango/PKGBUILD
community/lmctl/PKGBUILD
community/mediatomb/PKGBUILD
community/ruby-atk/PKGBUILD
community/ruby-gdkpixbuf2/PKGBUILD
community/ruby-gio2/PKGBUILD
community/ruby-glib2/PKGBUILD
community/ruby-pango/PKGBUILD
core/eglibc/glibc-2.10-bz4781.patch
core/eglibc/glibc-2.10-dont-build-timezone.patch
core/eglibc/glibc-2.12.1-static-shared-getpagesize.patch
core/eglibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
core/eglibc/glibc-2.13-futex.patch
core/eglibc/glibc-__i686.patch
extra/silc-toolkit/PKGBUILD
Diffstat (limited to 'core/util-linux/dmesg-space.patch')
-rw-r--r-- | core/util-linux/dmesg-space.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/core/util-linux/dmesg-space.patch b/core/util-linux/dmesg-space.patch deleted file mode 100644 index 2038888cc..000000000 --- a/core/util-linux/dmesg-space.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Fri, 2 Sep 2011 14:42:04 +0200 -Subject: [PATCH] dmesg: remove extra space only after time stamp - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - sys-utils/dmesg.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c -index 8e7bb4b..b3713a0 100644 ---- a/sys-utils/dmesg.c -+++ b/sys-utils/dmesg.c -@@ -480,11 +480,10 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) - break; - } - } -+ if (begin < end && *begin == ' ') -+ begin++; - } - -- if (begin < end && *begin == ' ') -- begin++; -- - rec->mesg = begin; - rec->mesg_size = end - begin; - --- -1.7.6.1 - |