| 1 |
commit: 5512df3af943c4f5c086a43874b1459ec270b785 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 21 18:51:16 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 27 22:44:26 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=5512df3a |
| 7 |
|
| 8 |
metadata.py: Resolve error when moving metadata.dtd |
| 9 |
|
| 10 |
If DISTDIR and PORTDIR/metadata/dtd live on different filesystems, |
| 11 |
os.rename() will fail. Use shutil.move() instead. |
| 12 |
|
| 13 |
pym/repoman/metadata.py | 3 ++- |
| 14 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/pym/repoman/metadata.py b/pym/repoman/metadata.py |
| 17 |
index f1fa53a..e95ad41 100644 |
| 18 |
--- a/pym/repoman/metadata.py |
| 19 |
+++ b/pym/repoman/metadata.py |
| 20 |
@@ -19,6 +19,7 @@ from repoman._portage import portage |
| 21 |
|
| 22 |
from portage import exception |
| 23 |
from portage import os |
| 24 |
+from portage import shutil |
| 25 |
from portage.output import green |
| 26 |
|
| 27 |
if sys.hexversion >= 0x3000000: |
| 28 |
@@ -143,7 +144,7 @@ def fetch_metadata_dtd(metadata_dtd, repoman_settings): |
| 29 |
except portage.exception.PortageException: |
| 30 |
pass |
| 31 |
|
| 32 |
- os.rename(metadata_dtd_tmp, metadata_dtd) |
| 33 |
+ shutil.move(metadata_dtd_tmp, metadata_dtd) |
| 34 |
finally: |
| 35 |
try: |
| 36 |
os.unlink(metadata_dtd_tmp) |
Archives