mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-30 01:12:58 +02:00
xbps-git: remove patches applied to the master branch.
This commit is contained in:
parent
aeed3675b3
commit
e67df7f0c2
3 changed files with 1 additions and 61 deletions
|
@ -1,35 +0,0 @@
|
||||||
commit aa154199a6d7d89bfe040755be289b1d827c5727
|
|
||||||
Author: Juan RP <xtraeme@gmail.com>
|
|
||||||
Date: Tue Sep 25 15:02:57 2012 +0200
|
|
||||||
|
|
||||||
xbps_transaction_update_packages: make packages on hold work (duh!).
|
|
||||||
|
|
||||||
diff --git a/lib/transaction_ops.c b/lib/transaction_ops.c
|
|
||||||
index aa26279..666bd38 100644
|
|
||||||
--- lib/transaction_ops.c
|
|
||||||
+++ lib/transaction_ops.c
|
|
||||||
@@ -204,7 +204,7 @@ xbps_transaction_update_packages(struct xbps_handle *xhp)
|
|
||||||
{
|
|
||||||
prop_object_t obj;
|
|
||||||
const char *pkgname, *holdpkgname;
|
|
||||||
- bool newpkg_found = false;
|
|
||||||
+ bool foundhold = false, newpkg_found = false;
|
|
||||||
int rv = 0;
|
|
||||||
size_t i, x;
|
|
||||||
|
|
||||||
@@ -219,9 +219,14 @@ xbps_transaction_update_packages(struct xbps_handle *xhp)
|
|
||||||
if (strcmp(pkgname, holdpkgname) == 0) {
|
|
||||||
xbps_dbg_printf(xhp, "[rpool] package %s on hold, "
|
|
||||||
"ignoring updates.\n", pkgname);
|
|
||||||
- continue;
|
|
||||||
+ foundhold = true;
|
|
||||||
+ break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ if (foundhold) {
|
|
||||||
+ foundhold = false;
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
rv = transaction_find_pkg(xhp, pkgname, false, true,
|
|
||||||
false, TRANS_UPDATE);
|
|
||||||
if (rv == 0)
|
|
|
@ -1,25 +0,0 @@
|
||||||
commit 4129a08cef7139b30b41ac659f35f9d494c2d918
|
|
||||||
Author: Juan RP <xtraeme@gmail.com>
|
|
||||||
Date: Wed Sep 19 07:04:59 2012 +0200
|
|
||||||
|
|
||||||
xbps-{bin,repo}: fixed crash in 'show' target reported by pancake.
|
|
||||||
|
|
||||||
diff --git a/bin/xbps-repo/show.c b/bin/xbps-repo/show.c
|
|
||||||
index 170b1bd..f8265de 100644
|
|
||||||
--- bin/xbps-repo/show.c
|
|
||||||
+++ bin/xbps-repo/show.c
|
|
||||||
@@ -127,11 +127,12 @@ show_pkg_namedesc(struct xbps_handle *xhp,
|
|
||||||
|
|
||||||
len = strlen(inststr) + strlen(tmp) + strlen(desc) + 1;
|
|
||||||
if (len > rsd->maxcols) {
|
|
||||||
- out = malloc(rsd->maxcols);
|
|
||||||
+ out = malloc(rsd->maxcols+1);
|
|
||||||
assert(out);
|
|
||||||
- snprintf(out, rsd->maxcols-2, "%s %s %s",
|
|
||||||
+ snprintf(out, rsd->maxcols-3, "%s %s %s",
|
|
||||||
inststr, tmp, desc);
|
|
||||||
strncat(out, "...", rsd->maxcols);
|
|
||||||
+ out[rsd->maxcols+1] = '\0';
|
|
||||||
printf("%s\n", out);
|
|
||||||
free(out);
|
|
||||||
} else {
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'xbps-git'
|
# Template file for 'xbps-git'
|
||||||
pkgname=xbps-git
|
pkgname=xbps-git
|
||||||
version="$(date -u +%Y%m%d)"
|
version="$(date -u +%Y%m%d)"
|
||||||
revision=2
|
revision=1
|
||||||
nofetch=yes
|
nofetch=yes
|
||||||
noextract=yes
|
noextract=yes
|
||||||
build_style=configure
|
build_style=configure
|
||||||
|
|
Loading…
Add table
Reference in a new issue