| 1 |
commit: 3c1111c248b11972f5d2316e6d8455b7fa11ccc4 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 29 03:00:15 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 29 03:00:15 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3c1111c2 |
| 7 |
|
| 8 |
movefile: remove unused lchown |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/util/movefile.py | 6 ++---- |
| 12 |
1 files changed, 2 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py |
| 15 |
index 995f6e7..70ecb60 100644 |
| 16 |
--- a/pym/portage/util/movefile.py |
| 17 |
+++ b/pym/portage/util/movefile.py |
| 18 |
@@ -197,10 +197,8 @@ def movefile(src, dest, newmtime=None, sstat=None, mysettings=None, |
| 19 |
return None # failure |
| 20 |
try: |
| 21 |
if didcopy: |
| 22 |
- if stat.S_ISLNK(sstat[stat.ST_MODE]): |
| 23 |
- lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID]) |
| 24 |
- else: |
| 25 |
- os.chown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID]) |
| 26 |
+ # didcopy is True only if S_ISREG returned True |
| 27 |
+ os.chown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID]) |
| 28 |
os.chmod(dest, stat.S_IMODE(sstat[stat.ST_MODE])) # Sticky is reset on chown |
| 29 |
os.unlink(src) |
| 30 |
except SystemExit as e: |
Archives