From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 84E5D138200 for ; Mon, 8 Jul 2013 18:30:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E126E09AA; Mon, 8 Jul 2013 18:30:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BCDBAE09AA for ; Mon, 8 Jul 2013 18:30:32 +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 94B1433E5FC for ; Mon, 8 Jul 2013 18:30:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 308BEE468F for ; Mon, 8 Jul 2013 18:30:30 +0000 (UTC) From: "Paul Varner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Paul Varner" Message-ID: <1373307974.0bd71cd8a16b54c9392afa30821e578315d53807.fuzzyray@gentoo> Subject: [gentoo-commits] proj/gentoolkit:gentoolkit commit in: man/, pym/gentoolkit/eclean/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: man/eclean.1 pym/gentoolkit/eclean/cli.py X-VCS-Directories: man/ pym/gentoolkit/eclean/ X-VCS-Committer: fuzzyray X-VCS-Committer-Name: Paul Varner X-VCS-Revision: 0bd71cd8a16b54c9392afa30821e578315d53807 X-VCS-Branch: gentoolkit Date: Mon, 8 Jul 2013 18:30:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f9a22e2e-c87c-4b5d-a8bd-93ab70fdfded X-Archives-Hash: b54fbe1686a8e31c7ee4d3baeec0c178 commit: 0bd71cd8a16b54c9392afa30821e578315d53807 Author: Paul Varner gentoo org> AuthorDate: Mon Jul 8 18:26:14 2013 +0000 Commit: Paul Varner gentoo org> CommitDate: Mon Jul 8 18:26:14 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=0bd71cd8 Rename eclean --destructive option to --deep (Bug #475808) This is a cosmetic change only. --destructive is still accepted for backwards compatibility. Additionally, options array still refers to the option as destrcutive. --- man/eclean.1 | 14 +++++++------- pym/gentoolkit/eclean/cli.py | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/man/eclean.1 b/man/eclean.1 index a6bad31..4267047 100644 --- a/man/eclean.1 +++ b/man/eclean.1 @@ -23,7 +23,7 @@ without recompiling it. Sure, it's also a mode in which your DISTDIR and PKGDIR stay rather big (although still not growing infinitely). For the 'distfiles', this mode is also quite slow because it requiries some access to the whole Portage tree. .PP -If you use the \-\-destructive option, eclean will only protect files corresponding to +If you use the \-\-deep option, eclean will only protect files corresponding to some currently installed package (taking their exact version into account). It will save much more space, while still preserving sources files around for minor revision bumps, and binaries for reinstallation of corrupted packages. But it won't keep files @@ -31,7 +31,7 @@ for less usual operations like downgrading or reinstalling an unmerged package. is also the fastest execution mode (big difference for distfiles), and the one used by most other cleaning scripts around like yacleaner (at least in its version 0.3). .PP -Somewhere in the middle, adding the \-\-package\-names option when using \-\-destructive +Somewhere in the middle, adding the \-\-package\-names option when using \-\-deep will protect files corresponding to all existing versions of installed packages. It will allow easy downgrading without recompilation or redownloading in case of trouble, but won't protect you against package uninstallation. @@ -53,7 +53,7 @@ Finally, you can list some categories or package names to protect in exclusion f .TP \fB\-C, \-\-nocolor\fP turn off colors on output .TP -\fB\-d, \-\-destructive\fP only keep the minimum for a reinstallation +\fB\-d, \-\-deep\fP only keep the minimum for a reinstallation .TP \fB\-e, \-\-exclude\-file=\fP path to the exclusion file \fB\fP is the absolute path to the exclusion file you want to use. @@ -63,7 +63,7 @@ you want to temporary ignore it. .TP \fB\-i, \-\-interactive\fP ask confirmation before deleting .TP -\fB\-n, \-\-package\-names\fP protect all versions (\-\-destructive only) +\fB\-n, \-\-package\-names\fP protect all versions (\-\-deep only) .TP \fB\-p, \-\-pretend\fP only display what would be cleaned .TP @@ -97,7 +97,7 @@ FEATURES flags. command\-line. .SS "Options for the 'distfiles' action" .TP -\fB\-f, \-\-fetch\-restricted\fP protect fetch\-restricted files (\-\-destructive only) +\fB\-f, \-\-fetch\-restricted\fP protect fetch\-restricted files (\-\-deep only) .TP \fB\-s, \-\-size\-limit=\fP don't delete distfiles bigger than is a size specification: "10M" is "ten megabytes", "200K" is "two hundreds kilobytes", @@ -161,7 +161,7 @@ are less than one month old, bigger than 50MB, or fetch\-restricted: .br .B # eclean\-dist \-d \-t1m \-s50M \-f .LP -From a crontab, silently clean packages in the safest mode, and then distfiles in destructive +From a crontab, silently clean packages in the safest mode, and then distfiles in deep mode but protecting files less than a week old, every sunday at 1am: .br .B 0 1 * * sun \ \ eclean \-C \-q packages ; eclean \-C \-q \-d \-t1w distfiles @@ -172,7 +172,7 @@ While running and searching distfiles for cleaning, elcean will report any unava .".TP ."The policy used to decide if a distfile can be removed or not relies on the SRC_URI variables ."of ebuilds. It means that if an ebuild uses files that are not part of its SRC_URI, eclean will ."probably remove them. This are ebuilds bugs, please report them as such on ."http://bugs.gentoo.org. .".TP -."In safest mode (default, without the \-\-destructive option), this script can be very slow. There +."In safest mode (default, without the \-\-deep option), this script can be very slow. There ."is not much to do about it without hacking outside of the portage API. .SH "SEE ALSO" .TP diff --git a/pym/gentoolkit/eclean/cli.py b/pym/gentoolkit/eclean/cli.py index 1682fdb..e6c75d0 100644 --- a/pym/gentoolkit/eclean/cli.py +++ b/pym/gentoolkit/eclean/cli.py @@ -112,19 +112,19 @@ def printUsage(_error=None, help=None): 'merged-distfiles-options') or help: print( "Available global", yellow("options")+":", file=out) print( yellow(" -C, --nocolor")+ - " - turn off colors on output", file=out) - print( yellow(" -d, --destructive")+ - " - only keep the minimum for a reinstallation", file=out) + " - turn off colors on output", file=out) + print( yellow(" -d, --deep")+ + " - only keep the minimum for a reinstallation", file=out) print( yellow(" -e, --exclude-file=")+ " - path to the exclusion file", file=out) print( yellow(" -i, --interactive")+ - " - ask confirmation before deletions", file=out) + " - ask confirmation before deletions", file=out) print( yellow(" -n, --package-names")+ - " - protect all versions (when --destructive)", file=out) + " - protect all versions (when --deep", file=out) print( yellow(" -p, --pretend")+ - " - only display what would be cleaned", file=out) + " - only display what would be cleaned", file=out) print( yellow(" -q, --quiet")+ - " - be as quiet as possible", file=out) + " - be as quiet as possible", file=out) print( yellow(" -t, --time-limit=