xbps{,-static}: another patch to fix xbps-reconfigure -a
.
This commit is contained in:
parent
3ead2f703e
commit
e36f96441c
3 changed files with 37 additions and 2 deletions
|
@ -3,7 +3,7 @@
|
|||
# NOTE: keep this package synchronized with "srcpkgs/xbps".
|
||||
pkgname=xbps-static
|
||||
version=0.49
|
||||
revision=3
|
||||
revision=4
|
||||
build_style=configure
|
||||
short_desc="The XBPS package system utilities - static binaries"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
From 1ed8551c08c11bd627d573cde48574200c7e8760 Mon Sep 17 00:00:00 2001
|
||||
From: Juan RP <xtraeme@voidlinux.eu>
|
||||
Date: Sat, 31 Oct 2015 15:03:26 +0100
|
||||
Subject: [PATCH] xbps_configure_packages: ignore internal xbps objects.
|
||||
|
||||
Fixes an assertion triggered by `xbps-reconfigure -a`.
|
||||
---
|
||||
NEWS | 3 +++
|
||||
lib/package_configure.c | 5 +++--
|
||||
2 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/package_configure.c b/lib/package_configure.c
|
||||
index be8aeb5..e279199 100644
|
||||
--- lib/package_configure.c
|
||||
+++ lib/package_configure.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*-
|
||||
- * Copyright (c) 2009-2014 Juan Romero Pardines.
|
||||
+ * Copyright (c) 2009-2015 Juan Romero Pardines.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -61,7 +61,8 @@ xbps_configure_packages(struct xbps_handle *xhp, xbps_array_t ignpkgs)
|
||||
assert(iter);
|
||||
while ((obj = xbps_object_iterator_next(iter))) {
|
||||
pkgd = xbps_dictionary_get_keysym(xhp->pkgdb, obj);
|
||||
- xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver);
|
||||
+ if (!xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver))
|
||||
+ continue;
|
||||
if (xbps_array_count(ignpkgs)) {
|
||||
if ((xbps_match_string_in_array(ignpkgs, pkgver)) ||
|
||||
(xbps_match_pkgver_in_array(ignpkgs, pkgver))) {
|
||||
--
|
||||
2.6.2
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'xbps'
|
||||
pkgname=xbps
|
||||
version=0.49
|
||||
revision=3
|
||||
revision=4
|
||||
bootstrap=yes
|
||||
build_style=configure
|
||||
short_desc="The XBPS package system utilities"
|
||||
|
|
Loading…
Reference in a new issue