| 1 |
Author: grobian |
| 2 |
Date: 2009-06-28 14:48:34 +0000 (Sun, 28 Jun 2009) |
| 3 |
New Revision: 13722 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/pym/_emerge/Binpkg.py |
| 7 |
main/branches/prefix/pym/_emerge/EbuildBuild.py |
| 8 |
main/branches/prefix/pym/_emerge/emergelog.py |
| 9 |
Log: |
| 10 |
logging /inside/ the prefix is much more fun |
| 11 |
|
| 12 |
Modified: main/branches/prefix/pym/_emerge/Binpkg.py |
| 13 |
=================================================================== |
| 14 |
--- main/branches/prefix/pym/_emerge/Binpkg.py 2009-06-28 13:41:26 UTC (rev 13721) |
| 15 |
+++ main/branches/prefix/pym/_emerge/Binpkg.py 2009-06-28 14:48:34 UTC (rev 13722) |
| 16 |
@@ -19,6 +19,7 @@ |
| 17 |
sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) |
| 18 |
import portage |
| 19 |
from portage.output import colorize |
| 20 |
+from portage.const import EPREFIX |
| 21 |
class Binpkg(CompositeTask): |
| 22 |
|
| 23 |
__slots__ = ("find_blockers", |
| 24 |
@@ -82,7 +83,7 @@ |
| 25 |
waiting_msg = ("Fetching '%s' " + \ |
| 26 |
"in the background. " + \ |
| 27 |
"To view fetch progress, run `tail -f " + \ |
| 28 |
- "/var/log/emerge-fetch.log` in another " + \ |
| 29 |
+ EPREFIX + "/var/log/emerge-fetch.log` in another " + \ |
| 30 |
"terminal.") % prefetcher.pkg_path |
| 31 |
msg_prefix = colorize("GOOD", " * ") |
| 32 |
from textwrap import wrap |
| 33 |
|
| 34 |
Modified: main/branches/prefix/pym/_emerge/EbuildBuild.py |
| 35 |
=================================================================== |
| 36 |
--- main/branches/prefix/pym/_emerge/EbuildBuild.py 2009-06-28 13:41:26 UTC (rev 13721) |
| 37 |
+++ main/branches/prefix/pym/_emerge/EbuildBuild.py 2009-06-28 14:48:34 UTC (rev 13722) |
| 38 |
@@ -20,6 +20,7 @@ |
| 39 |
sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) |
| 40 |
import portage |
| 41 |
from portage.output import colorize |
| 42 |
+from portage.const import EPREFIX |
| 43 |
class EbuildBuild(CompositeTask): |
| 44 |
|
| 45 |
__slots__ = ("args_set", "config_pool", "find_blockers", |
| 46 |
@@ -53,7 +54,7 @@ |
| 47 |
waiting_msg = "Fetching files " + \ |
| 48 |
"in the background. " + \ |
| 49 |
"To view fetch progress, run `tail -f " + \ |
| 50 |
- "/var/log/emerge-fetch.log` in another " + \ |
| 51 |
+ EPREFIX + "/var/log/emerge-fetch.log` in another " + \ |
| 52 |
"terminal." |
| 53 |
msg_prefix = colorize("GOOD", " * ") |
| 54 |
from textwrap import wrap |
| 55 |
|
| 56 |
Modified: main/branches/prefix/pym/_emerge/emergelog.py |
| 57 |
=================================================================== |
| 58 |
--- main/branches/prefix/pym/_emerge/emergelog.py 2009-06-28 13:41:26 UTC (rev 13721) |
| 59 |
+++ main/branches/prefix/pym/_emerge/emergelog.py 2009-06-28 14:48:34 UTC (rev 13722) |
| 60 |
@@ -16,8 +16,9 @@ |
| 61 |
|
| 62 |
from portage.data import secpass |
| 63 |
from portage.output import xtermTitle |
| 64 |
+from portage.const import EPREFIX |
| 65 |
|
| 66 |
-_emerge_log_dir = '/var/log' |
| 67 |
+_emerge_log_dir = EPREFIX + '/var/log' |
| 68 |
|
| 69 |
def emergelog(xterm_titles, mystr, short_msg=None): |
| 70 |
if xterm_titles and short_msg: |
Archives