From c6da8e45f90d64006379e55364e113230c562b21 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 24 Nov 2012 08:54:12 +0100 Subject: [PATCH] xbps: new patch for xbps-rindex from git master. --- ...abb88ee734d094174c509b4fd82ff9ed00b9.patch | 42 +++++++++++++++++++ srcpkgs/xbps/template | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xbps/patches/743eabb88ee734d094174c509b4fd82ff9ed00b9.patch diff --git a/srcpkgs/xbps/patches/743eabb88ee734d094174c509b4fd82ff9ed00b9.patch b/srcpkgs/xbps/patches/743eabb88ee734d094174c509b4fd82ff9ed00b9.patch new file mode 100644 index 00000000000..f33e2306bf4 --- /dev/null +++ b/srcpkgs/xbps/patches/743eabb88ee734d094174c509b4fd82ff9ed00b9.patch @@ -0,0 +1,42 @@ +From 743eabb88ee734d094174c509b4fd82ff9ed00b9 Mon Sep 17 00:00:00 2001 +From: Juan RP +Date: Sat, 24 Nov 2012 08:50:52 +0100 +Subject: [PATCH] xbps-rindex: dont panic if old binpkg doesn't exist. + +--- + bin/xbps-rindex/common.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/bin/xbps-rindex/common.c b/bin/xbps-rindex/common.c +index cca7871..43e55fe 100644 +--- bin/xbps-rindex/common.c ++++ bin/xbps-rindex/common.c +@@ -42,18 +42,18 @@ remove_pkg(const char *repodir, const char *arch, const char *file) + char *filepath; + int rv; + +- /* Remove real binpkg */ + filepath = xbps_xasprintf("%s/%s/%s", repodir, arch, file); + if (remove(filepath) == -1) { +- rv = errno; +- xbps_error_printf("failed to remove old binpkg `%s': %s\n", +- file, strerror(rv)); +- free(filepath); +- return rv; ++ if (errno != ENOENT) { ++ rv = errno; ++ xbps_error_printf("failed to remove old binpkg " ++ "`%s': %s\n", file, strerror(rv)); ++ free(filepath); ++ return rv; ++ } + } + free(filepath); + +- /* Remove symlink to binpkg */ + filepath = xbps_xasprintf("%s/%s", repodir, file); + if (remove(filepath) == -1) { + rv = errno; +-- +1.8.0 + diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 2b4abe34c10..8beceb5d29c 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.18 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin --with-tests --with-static" depends="xbps-triggers"