aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-09-08 05:31:19 +0800
committerXan Lopez <xan@igalia.com>2012-09-08 05:31:19 +0800
commit8c793b0359e216cfd96b1d0a3f46e6d2a5f6fda3 (patch)
treec23c3883056279c8f589c787fd021656b98de465
parent73fbd13b0f415a354d0c3b47aea367f84de007cf (diff)
downloadgsoc2013-epiphany-8c793b0359e216cfd96b1d0a3f46e6d2a5f6fda3.tar
gsoc2013-epiphany-8c793b0359e216cfd96b1d0a3f46e6d2a5f6fda3.tar.gz
gsoc2013-epiphany-8c793b0359e216cfd96b1d0a3f46e6d2a5f6fda3.tar.bz2
gsoc2013-epiphany-8c793b0359e216cfd96b1d0a3f46e6d2a5f6fda3.tar.lz
gsoc2013-epiphany-8c793b0359e216cfd96b1d0a3f46e6d2a5f6fda3.tar.xz
gsoc2013-epiphany-8c793b0359e216cfd96b1d0a3f46e6d2a5f6fda3.tar.zst
gsoc2013-epiphany-8c793b0359e216cfd96b1d0a3f46e6d2a5f6fda3.zip
Revert "ephy-profile-utils: don't replace environment when spwaning ephy-profile-migrator"
This reverts commit adfecc2bb03ed280543dc5ad4ba6fa350ff00d8c. This breaks the migrator tests.
-rw-r--r--lib/ephy-profile-utils.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/ephy-profile-utils.c b/lib/ephy-profile-utils.c
index 2c685e05f..51dd7e1b8 100644
--- a/lib/ephy-profile-utils.c
+++ b/lib/ephy-profile-utils.c
@@ -208,11 +208,7 @@ ephy_profile_utils_do_migration (const char *profile_directory, int test_to_run,
int status;
char *argv[6] = { EPHY_PROFILE_MIGRATOR, "-v" };
int i = 2; /* index for argv, start filling at 2. */
- char **envp;
-
- envp = g_environ_setenv (g_get_environ (),
- "EPHY_LOG_MODULES", "ephy-profile",
- TRUE);
+ char *envp[1] = { "EPHY_LOG_MODULES=ephy-profile" };
argv[i++] = version = g_strdup_printf ("%d", EPHY_PROFILE_MIGRATION_VERSION);
@@ -238,7 +234,6 @@ ephy_profile_utils_do_migration (const char *profile_directory, int test_to_run,
&status, &error);
g_free (index);
g_free (version);
- g_strfreev (envp);
if (error) {
LOG ("Failed to run migrator: %s", error->message);