emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libxbps: renamed xbps_repository_{install,update}_xxx to xbps_transaction_xxx.

Browse Source
This commit is contained in:
Juan RP
2011-11-25 10:12:03 +01:00
parent f3099fa2c6
commit bbfd2813b2
5 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/xbps-bin/Makefile
View File

@@ -2,7 +2,7 @@ TOPDIR = ../..
-include $(TOPDIR)/config.mk
BIN = xbps-bin
OBJS = install.o main.o remove.o show-deps.o
OBJS = transaction.o main.o remove.o show-deps.o
OBJS += show-info-files.o util.o find-files.o
OBJS += question.o fetch_cb.o state_cb.o
OBJS += check.o check_pkg_automatic.o check_pkg_files.o

8
bin/xbps-bin/install.c → bin/xbps-bin/transaction.c
View File

@@ -187,7 +187,7 @@ autoupdate_pkgs(bool yes, bool show_download_pkglist_url)
* Update all currently installed packages, aka
* "xbps-bin autoupdate".
*/
if ((rv = xbps_repository_update_packages()) != 0) {
if ((rv = xbps_transaction_update_packages()) != 0) {
if (rv == ENOENT) {
printf("No packages currently registered.\n");
return 0;
@@ -219,7 +219,7 @@ install_new_pkg(const char *pkg)
if (xbps_pkgpattern_version(pkg)) {
pkgpatt = __UNCONST(pkg);
} else {
/*
/*
* If only pkgname has been specified, always append
* '-[0-9]*' at the end, will be easier to parse.
*/
@@ -246,7 +246,7 @@ install_new_pkg(const char *pkg)
}
printf("Package `%s' needs to be configured.\n", pkgname);
}
if ((rv = xbps_repository_install_pkg(pkgpatt)) != 0) {
if ((rv = xbps_transaction_install_pkg(pkgpatt)) != 0) {
if (rv == ENOENT) {
xbps_error_printf("xbps-bin: unable to locate '%s' in "
"repository pool.\n", pkg);
@@ -272,7 +272,7 @@ update_pkg(const char *pkgname)
{
int rv = 0;
rv = xbps_repository_update_pkg(pkgname);
rv = xbps_transaction_update_pkg(pkgname);
if (rv == EEXIST)
printf("Package '%s' is up to date.\n", pkgname);
else if (rv == ENOENT)