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 ) id 1ScUfO-00075G-8o for garchives@archives.gentoo.org; Thu, 07 Jun 2012 04:49:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF80BE055C; Thu, 7 Jun 2012 04:49:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A2B40E055C for ; Thu, 7 Jun 2012 04:49:42 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB8591B4004 for ; Thu, 7 Jun 2012 04:49:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 96AA3E5432 for ; Thu, 7 Jun 2012 04:49:39 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1339044460.4ec06a0babf271b1664d1850ebcd75a05d4e3599.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:master commit in: layman/ X-VCS-Repository: proj/layman X-VCS-Files: layman/utils.py X-VCS-Directories: layman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 4ec06a0babf271b1664d1850ebcd75a05d4e3599 X-VCS-Branch: master Date: Thu, 7 Jun 2012 04:49:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: db7108c7-6442-4580-bd24-788ea7e9a6e4 X-Archives-Hash: eb334992c13e1ee94969d7cc286af633 commit: 4ec06a0babf271b1664d1850ebcd75a05d4e3599 Author: Brian Dolbec gentoo org> AuthorDate: Thu Jun 7 04:47:40 2012 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu Jun 7 04:47:40 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/layman.git;a=3D= commit;h=3D4ec06a0b fix a missed update from the old OUT variable usage. --- layman/utils.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/layman/utils.py b/layman/utils.py index 9ffdda0..7cfdaef 100644 --- a/layman/utils.py +++ b/layman/utils.py @@ -34,7 +34,7 @@ import sys import locale import codecs =20 -from layman.debug import OUT +from layman.output import Message =20 =20 #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D @@ -163,7 +163,11 @@ def path(path_elements): =20 return pathname =20 -def delete_empty_directory(mdir, output=3DOUT): +def delete_empty_directory(mdir, output=3DNone): + # test for a usable output parameter, + # and make it usable if not + if output is None: + output =3D Message() if os.path.exists(mdir) and not os.listdir(mdir): # Check for sufficient privileges if os.access(mdir, os.W_OK):