Gentoo Archives: gentoo-commits

From: Brian Dolbec <dolsen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/
Date: Sun, 31 Jan 2016 20:03:55
Message-Id: 1454185524.014910ba6d7db13763d5de1bf1a4f7d9eb59d38c.dolsen@gentoo
1 commit: 014910ba6d7db13763d5de1bf1a4f7d9eb59d38c
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: Sat Jan 30 20:25:24 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=014910ba
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)