summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2011-12-07 16:01:14 +0000
committerJeremy Olexa <darkside@gentoo.org>2011-12-07 16:01:14 +0000
commitbbca16f22b51f5071a14baa0872fe532acb557e3 (patch)
tree119a6e1be5114459988bf5507669ec1e8fccea98 /dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch
parent[dev-util/catalyst] Try experimental patch for /etc/portage/make.profile, take 2 (diff)
downloaddarkside-bbca16f22b51f5071a14baa0872fe532acb557e3.tar.gz
darkside-bbca16f22b51f5071a14baa0872fe532acb557e3.tar.bz2
darkside-bbca16f22b51f5071a14baa0872fe532acb557e3.zip
from last commit, fix syntax error in patch
Diffstat (limited to 'dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch')
-rw-r--r--dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch b/dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch
index 30fb65e..64b03e8 100644
--- a/dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch
+++ b/dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch
@@ -1,6 +1,6 @@
-From 22bd478b2043379218271e2100029dbfce4c1413 Mon Sep 17 00:00:00 2001
+From a800c2e9ce394b076eb4e15ae1cfa9a197e7aabb Mon Sep 17 00:00:00 2001
From: Jeremy Olexa <darkside@gentoo.org>
-Date: Wed, 7 Dec 2011 15:39:17 +0000
+Date: Wed, 7 Dec 2011 15:58:25 +0000
Subject: [PATCH] s:/etc/make.profile:/etc/portage/make.profile:g - Use new location
Take 2, specify target symlink better and create /etc/portage first
@@ -12,7 +12,7 @@ Take 2, specify target symlink better and create /etc/portage first
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
-index 55baea7..893583f 100644
+index 55baea7..6e0bc33 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -813,11 +813,12 @@ class generic_stage_target(generic_target):
@@ -23,7 +23,7 @@ index 55baea7..893583f 100644
+ cmd("rm -f "+self.settings["chroot_path"]+"/etc/portage/make.profile",\
"Error zapping profile link",env=self.env)
- cmd("ln -sf ../usr/portage/profiles/"+\
-+ cmd("mkdir self.settings["chroot_path"]+"/etc/portage/"")
++ cmd("mkdir "+self.settings["chroot_path"]+"/etc/portage/")
+ cmd("ln -sf ../../usr/portage/profiles/"+\
self.settings["target_profile"]+" "+\
- self.settings["chroot_path"]+"/etc/make.profile",\