r23081 - in /desktop/experimental/glib2.0/debian: changelog control control.in patches/05-dont-fail-a-couple-of-tests-when-running-as-root.patch patches/series
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sat Feb 20 11:49:25 UTC 2010
Author: pochu
Date: Sat Feb 20 11:49:23 2010
New Revision: 23081
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23081
Log:
* debian/patches/05-dont-fail-a-couple-of-tests-when-running-as-root.patch:
- Added, expect a couple of tests that play with file permissions
to succeed when running as root.
* debian/control.in:
- Add desktop-file-utils to build depends to fix another test.
Added:
desktop/experimental/glib2.0/debian/patches/05-dont-fail-a-couple-of-tests-when-running-as-root.patch
Modified:
desktop/experimental/glib2.0/debian/changelog
desktop/experimental/glib2.0/debian/control
desktop/experimental/glib2.0/debian/control.in
desktop/experimental/glib2.0/debian/patches/series
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=23081&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Sat Feb 20 11:49:23 2010
@@ -1,3 +1,13 @@
+glib2.0 (2.23.3-2) UNRELEASED; urgency=low
+
+ * debian/patches/05-dont-fail-a-couple-of-tests-when-running-as-root.patch:
+ - Added, expect a couple of tests that play with file permissions
+ to succeed when running as root.
+ * debian/control.in:
+ - Add desktop-file-utils to build depends to fix another test.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 20 Feb 2010 10:26:32 +0100
+
glib2.0 (2.23.3-1) experimental; urgency=low
* New upstream development release:
Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=23081&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Sat Feb 20 11:49:23 2010
@@ -11,6 +11,7 @@
quilt,
dpkg-dev (>= 1.14.13),
libpcre3-dev (>= 7.4-1~),
+ desktop-file-utils,
gtk-doc-tools,
type-handling,
libselinux1-dev | not+linux-gnu,
Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=23081&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control.in [utf-8] Sat Feb 20 11:49:23 2010
@@ -11,6 +11,7 @@
quilt,
dpkg-dev (>= 1.14.13),
libpcre3-dev (>= 7.4-1~),
+ desktop-file-utils,
gtk-doc-tools,
type-handling,
libselinux1-dev | not+linux-gnu,
Added: desktop/experimental/glib2.0/debian/patches/05-dont-fail-a-couple-of-tests-when-running-as-root.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/05-dont-fail-a-couple-of-tests-when-running-as-root.patch?rev=23081&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/05-dont-fail-a-couple-of-tests-when-running-as-root.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/05-dont-fail-a-couple-of-tests-when-running-as-root.patch [utf-8] Sat Feb 20 11:49:23 2010
@@ -1,0 +1,50 @@
+From 7e9b5759df9fd29c03d9eb0ee6ddf41321af13e3 Mon Sep 17 00:00:00 2001
+From: Emilio Pozuelo Monfort <pochu27 at gmail.com>
+Date: Fri, 19 Feb 2010 19:00:02 +0100
+Subject: [PATCH] Don't fail a couple of tests when running as root
+
+root can access and write to a directory when it doesn't have
+exec and write permissions respectively. So expect the tests that
+check that to succeed rather than to fail when running as root.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=552912
+---
+ gio/tests/live-g-file.c | 15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/gio/tests/live-g-file.c b/gio/tests/live-g-file.c
+index e0f9bff..cb548ac 100644
+--- a/gio/tests/live-g-file.c
++++ b/gio/tests/live-g-file.c
+@@ -23,6 +23,8 @@
+ #include <glib/glib.h>
+ #include <gio/gio.h>
+ #include <stdlib.h>
++#include <unistd.h>
++#include <sys/types.h>
+ #include <string.h>
+ #include <sys/stat.h>
+
+@@ -715,8 +717,17 @@ do_copy_move (GFile * root, struct StructureItem item, const char *target_dir,
+ else if (((item.extra_flags & TEST_NO_ACCESS) == TEST_NO_ACCESS) ||
+ (extra_flags == TEST_NO_ACCESS))
+ {
+- g_assert_cmpint (res, ==, FALSE);
+- g_assert_error (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED);
++ /* This works for root, see bug #552912 */
++ if (getuid () == 0)
++ {
++ g_assert_cmpint (res, ==, TRUE);
++ g_assert_no_error (error);
++ }
++ else
++ {
++ g_assert_cmpint (res, ==, FALSE);
++ g_assert_error (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED);
++ }
+ }
+ /* no error should be found, all exceptions defined above */
+ else
+--
+1.7.0
+
Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=23081&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Sat Feb 20 11:49:23 2010
@@ -2,4 +2,5 @@
02_gettext-desktopfiles-ubuntu.patch
03_blacklist-directories.patch
04_homedir_env.patch
+05-dont-fail-a-couple-of-tests-when-running-as-root.patch
60_wait-longer-for-threads-to-die.patch
More information about the pkg-gnome-commits
mailing list