| 1 |
Author: zmedico |
| 2 |
Date: 2009-06-26 20:10:06 +0000 (Fri, 26 Jun 2009) |
| 3 |
New Revision: 13698 |
| 4 |
|
| 5 |
Added: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Modified: |
| 8 |
main/trunk/bin/emerge |
| 9 |
Log: |
| 10 |
Move __init__.py to main.py. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/bin/emerge |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/bin/emerge 2009-06-26 20:06:08 UTC (rev 13697) |
| 16 |
+++ main/trunk/bin/emerge 2009-06-26 20:10:06 UTC (rev 13698) |
| 17 |
@@ -26,7 +26,7 @@ |
| 18 |
signal.signal(signal.SIGUSR1, debug_signal) |
| 19 |
|
| 20 |
try: |
| 21 |
- import _emerge |
| 22 |
+ from _emerge.main import emerge_main |
| 23 |
except ImportError: |
| 24 |
from os import path as osp |
| 25 |
import sys |
| 26 |
@@ -37,7 +37,7 @@ |
| 27 |
import sys |
| 28 |
from portage.exception import ParseError, PermissionDenied |
| 29 |
try: |
| 30 |
- retval = _emerge.emerge_main() |
| 31 |
+ retval = emerge_main() |
| 32 |
except PermissionDenied, e: |
| 33 |
sys.stderr.write("Permission denied: '%s'\n" % str(e)) |
| 34 |
sys.exit(e.errno) |
| 35 |
|
| 36 |
Added: main/trunk/pym/_emerge/__init__.py |
| 37 |
=================================================================== |
| 38 |
--- main/trunk/pym/_emerge/__init__.py (rev 0) |
| 39 |
+++ main/trunk/pym/_emerge/__init__.py 2009-06-26 20:10:06 UTC (rev 13698) |
| 40 |
@@ -0,0 +1,3 @@ |
| 41 |
+# Copyright 2009 Gentoo Foundation |
| 42 |
+# Distributed under the terms of the GNU General Public License v2 |
| 43 |
+# $Id$ |
| 44 |
|
| 45 |
|
| 46 |
Property changes on: main/trunk/pym/_emerge/__init__.py |
| 47 |
___________________________________________________________________ |
| 48 |
Name: svn:keywords |
| 49 |
+ Id |
Archives