From: "Jeremy Olexa" <darkside@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/darkside:master commit in: dev-util/catalyst/files/
Date: Wed, 7 Dec 2011 16:01:23 +0000 (UTC) [thread overview]
Message-ID: <bbca16f22b51f5071a14baa0872fe532acb557e3.darkside@gentoo> (raw)
commit: bbca16f22b51f5071a14baa0872fe532acb557e3
Author: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 7 16:01:14 2011 +0000
Commit: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
CommitDate: Wed Dec 7 16:01:14 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=bbca16f2
from last commit, fix syntax error in patch
---
...profile-etc-portage-make.profile-g-Use-ne.patch | 8 ++++----
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",\
next reply other threads:[~2011-12-07 16:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-07 16:01 Jeremy Olexa [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-12-07 15:42 [gentoo-commits] dev/darkside:master commit in: dev-util/catalyst/files/ Jeremy Olexa
2011-12-01 4:33 Jeremy Olexa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bbca16f22b51f5071a14baa0872fe532acb557e3.darkside@gentoo \
--to=darkside@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox