| 1 |
Author: grobian |
| 2 |
Date: 2009-06-24 08:45:19 +0000 (Wed, 24 Jun 2009) |
| 3 |
New Revision: 13683 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
bad svn for not barking at me for checking in conflicts |
| 9 |
|
| 10 |
Modified: main/branches/prefix/pym/_emerge/__init__.py |
| 11 |
=================================================================== |
| 12 |
--- main/branches/prefix/pym/_emerge/__init__.py 2009-06-24 08:36:19 UTC (rev 13682) |
| 13 |
+++ main/branches/prefix/pym/_emerge/__init__.py 2009-06-24 08:45:19 UTC (rev 13683) |
| 14 |
@@ -10175,11 +10175,7 @@ |
| 15 |
_bad_resume_opts = set(["--ask", "--changelog", |
| 16 |
"--resume", "--skipfirst"]) |
| 17 |
|
| 18 |
-<<<<<<< .working |
| 19 |
- _fetch_log = EPREFIX + "/var/log/emerge-fetch.log" |
| 20 |
-======= |
| 21 |
_fetch_log = os.path.join(_emerge_log_dir, 'emerge-fetch.log') |
| 22 |
->>>>>>> .merge-right.r13652 |
| 23 |
|
| 24 |
class _iface_class(SlotObject): |
| 25 |
__slots__ = ("dblinkEbuildPhase", "dblinkDisplayMerge", |
Archives