From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-391345-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RDg7b-0000ob-Db
for garchives@archives.gentoo.org; Tue, 11 Oct 2011 17:28:07 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 90E8E21C1C7;
Tue, 11 Oct 2011 17:27:58 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 5C9DE21C0A4
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Oct 2011 17:27:58 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D592164223
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Oct 2011 17:27:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id DCD3A80042
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Oct 2011 17:27:56 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <79589ca29ecdbfafbc50b0899a51ce3f4eba1857.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/
X-VCS-Repository: proj/portage
X-VCS-Files: pym/portage/package/ebuild/fetch.py
X-VCS-Directories: pym/portage/package/ebuild/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 79589ca29ecdbfafbc50b0899a51ce3f4eba1857
Date: Tue, 11 Oct 2011 17:27:56 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: f5ef2f232e25c3315cc49548faefba54
commit: 79589ca29ecdbfafbc50b0899a51ce3f4eba1857
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 17:27:44 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 17:27:44 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D79589ca2
fetch: tweak space msg for bug #386797
---
pym/portage/package/ebuild/fetch.py | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/eb=
uild/fetch.py
index 9f66148..43597ac 100644
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@ -612,18 +612,6 @@ def fetch(myuris, mysettings, listonly=3D0, fetchonl=
y=3D0,
elif userfetch:
has_space =3D False
=20
- if not has_space:
- writemsg(_("!!! Insufficient space to store %s in %s\n") % \
- (myfile, mysettings["DISTDIR"]), noiselevel=3D-1)
-
- if has_space_superuser:
- writemsg(_("!!! Insufficient privileges to use "
- "remaining space.\n"), noiselevel=3D-1)
- if userfetch:
- writemsg(_("!!! You may set FEATURES=3D\"-userfetch\""
- " in /etc/make.conf in order to fetch with\n"
- "!!! superuser privileges.\n"), noiselevel=3D-1)
-
if distdir_writable and use_locks:
=20
lock_kwargs =3D {}
@@ -727,6 +715,20 @@ def fetch(myuris, mysettings, listonly=3D0, fetchonl=
y=3D0,
os.symlink(readonly_file, myfile_path)
continue
=20
+ # this message is shown only after we know that
+ # the file is not already fetched
+ if not has_space:
+ writemsg(_("!!! Insufficient space to store %s in %s\n") % \
+ (myfile, mysettings["DISTDIR"]), noiselevel=3D-1)
+
+ if has_space_superuser:
+ writemsg(_("!!! Insufficient privileges to use "
+ "remaining space.\n"), noiselevel=3D-1)
+ if userfetch:
+ writemsg(_("!!! You may set FEATURES=3D\"-userfetch\""
+ " in /etc/make.conf in order to fetch with\n"
+ "!!! superuser privileges.\n"), noiselevel=3D-1)
+
if fsmirrors and not os.path.exists(myfile_path) and has_space:
for mydir in fsmirrors:
mirror_file =3D os.path.join(mydir, myfile)