From 758cd4fd11efcc15bcd402734300dbe3270bfdab Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 8 May 2012 09:54:06 +0200 Subject: [PATCH] xbps-bin(8): renamed autoupdate target to dist-upgrade. --- NEWS | 2 ++ bin/xbps-bin/defs.h | 2 +- bin/xbps-bin/main.c | 8 ++++---- bin/xbps-bin/transaction.c | 2 +- bin/xbps-bin/xbps-bin.8 | 18 +++++++++--------- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index cc595bec..8207f4d7 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,7 @@ xbps-0.16 (???): + * xbps-bin(8): renamed "autoupdate" target to "dist-upgrade". + * Added support to put packages "on hold". Packages on hold won't be updated by system upgrades even if there is a newer version. The configuration string list "PackagesOnHold" in xbps.conf expects diff --git a/bin/xbps-bin/defs.h b/bin/xbps-bin/defs.h index c1047d0a..ee55270b 100644 --- a/bin/xbps-bin/defs.h +++ b/bin/xbps-bin/defs.h @@ -44,7 +44,7 @@ struct list_pkgver_cb { int install_new_pkg(const char *, bool); int update_pkg(const char *); int remove_pkg(const char *, bool); -int autoupdate_pkgs(bool, bool, bool); +int dist_upgrade(bool, bool, bool); int autoremove_pkgs(bool, bool); int exec_transaction(bool, bool, bool); diff --git a/bin/xbps-bin/main.c b/bin/xbps-bin/main.c index c5d1836a..156de3ba 100644 --- a/bin/xbps-bin/main.c +++ b/bin/xbps-bin/main.c @@ -64,10 +64,10 @@ usage(bool fail) "[targets]\n" " autoremove\n" " Auto remove all package orphans.\n" - " autoupdate\n" - " Auto update all packages to newest versions.\n" " check \n" " Package integrity check for `pkgname' or `all' packages.\n" + " dist-upgrade\n" + " Update all currently installed packages to newest versions.\n" " find-files [patterns]\n" " Print package name/version for any pattern matched.\n" " install [patterns]\n" @@ -333,14 +333,14 @@ main(int argc, char **argv) else rv = check_pkg_integrity(NULL, argv[1], true, NULL); - } else if (strcasecmp(argv[0], "autoupdate") == 0) { + } else if (strcasecmp(argv[0], "dist-upgrade") == 0) { /* * To update all packages currently installed. */ if (argc != 1) usage(true); - rv = autoupdate_pkgs(yes, dry_run, show_download_pkglist_url); + rv = dist_upgrade(yes, dry_run, show_download_pkglist_url); } else if (strcasecmp(argv[0], "show-orphans") == 0) { /* diff --git a/bin/xbps-bin/transaction.c b/bin/xbps-bin/transaction.c index 62ee3d3e..10f44c0a 100644 --- a/bin/xbps-bin/transaction.c +++ b/bin/xbps-bin/transaction.c @@ -215,7 +215,7 @@ show_transaction_sizes(struct transaction *trans) } int -autoupdate_pkgs(bool yes, bool dry_run, bool show_download_pkglist_url) +dist_upgrade(bool yes, bool dry_run, bool show_download_pkglist_url) { int rv = 0; diff --git a/bin/xbps-bin/xbps-bin.8 b/bin/xbps-bin/xbps-bin.8 index 237067bd..f7b3902d 100644 --- a/bin/xbps-bin/xbps-bin.8 +++ b/bin/xbps-bin/xbps-bin.8 @@ -1,4 +1,4 @@ -.Dd February 3, 2012 +.Dd May 8, 2012 .Os Void GNU/Linux .Dt xbps-bin 8 .Sh NAME @@ -30,7 +30,7 @@ Sets the boolean object for a package, therefore explicitly setting that package was installed as it were a dependency, even if it is not. Use of this option takes effect in the -.Em autoupdate , +.Em dist-upgrade , .Em install and .Em update @@ -51,7 +51,7 @@ Enables extra debugging output to be shown to stderr. Only show the URLs to download the binary packages from repositories. This is useful if you want to download them by other means, and later you can move them to the cachedir to start the installation. This option can be used for -the install, update and autoupdate targets. +the install, update and dist-upgrade targets. .It Fl F Used currently in the .Em remove @@ -80,7 +80,7 @@ Sets the boolean object for package to false, therefore explicitly setting that package was installed manually by the user. Use of this option takes effect in the -.Em autoupdate , +.Em dist-upgrade , .Em install and .Em update @@ -91,7 +91,7 @@ Enables dry-run mode. To show the actions that would be executed in a transaction. This mode takes effect in the .Em autoremove , -.Em autoupdate , +.Em dist-upgrade , .Em install , .Rm remove and @@ -137,14 +137,14 @@ Please note that all targets are case insensitive. Removes package orphans. These packages were installed as dependencies and currently there is not any package depending on it, directly or indirectly. Usually it is safe to always answer yes. -.It Sy autoupdate -Updates all currently installed packages to the newest version available in -all repositories. .It Sy check Ar pkgname | Ar all Checks for integrity errors in installed packages. The checks are to found missing run-time dependencies, missing and modified package files and metadata files. If the all keyword is used, all packages currently installed will be checked, otherwise just pkgname. +.It Sy dist-upgrade +Updates all currently installed packages to the newest version available in +all repositories. .It Sy find-files Ar pattern Ar [patterns ...] Prints the name of the installed .Em package(s) @@ -229,7 +229,7 @@ Updates to the most newer version available in repository pool. This can be used if only .Em pkgname(s) need to be updated, unlike the -.Em autoupdate +.Em dist-upgrade target that will update all currently installed packages. .Sh PACKAGE STATES A package can be in a different state while it is being