| 1 |
commit: a706f4489a017f2609b36acc50081e58e3a7e07f |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 29 16:07:25 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 29 16:07:25 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a706f448 |
| 7 |
|
| 8 |
emergelog: only set permission on creation |
| 9 |
|
| 10 |
This will fix bug #365319. |
| 11 |
|
| 12 |
--- |
| 13 |
pym/_emerge/emergelog.py | 8 +++++--- |
| 14 |
1 files changed, 5 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/_emerge/emergelog.py b/pym/_emerge/emergelog.py |
| 17 |
index 4006530..dde662e 100644 |
| 18 |
--- a/pym/_emerge/emergelog.py |
| 19 |
+++ b/pym/_emerge/emergelog.py |
| 20 |
@@ -32,13 +32,15 @@ def emergelog(xterm_titles, mystr, short_msg=None): |
| 21 |
xtermTitle(short_msg) |
| 22 |
try: |
| 23 |
file_path = os.path.join(_emerge_log_dir, 'emerge.log') |
| 24 |
+ existing_log = os.path.isfile(file_path) |
| 25 |
mylogfile = codecs.open(_unicode_encode(file_path, |
| 26 |
encoding=_encodings['fs'], errors='strict'), |
| 27 |
mode='a', encoding=_encodings['content'], |
| 28 |
errors='backslashreplace') |
| 29 |
- portage.util.apply_secpass_permissions(file_path, |
| 30 |
- uid=portage.portage_uid, gid=portage.portage_gid, |
| 31 |
- mode=0o660) |
| 32 |
+ if not existing_log: |
| 33 |
+ portage.util.apply_secpass_permissions(file_path, |
| 34 |
+ uid=portage.portage_uid, gid=portage.portage_gid, |
| 35 |
+ mode=0o660) |
| 36 |
mylock = None |
| 37 |
try: |
| 38 |
mylock = portage.locks.lockfile(mylogfile) |
Archives