[alpine-devel] [PATCH apk-tools 1/2] database: include POSIX header for ST_* defines
Export this patch
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
---
src/database.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/database.c b/src/database.c
index ab6a8cb..12f1d16 100644
--- a/src/database.c
+++ b/src/database.c
@@ -26,6 +26,7 @@
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/mount.h>
+ #include <sys/statvfs.h>
#include <linux/magic.h>
#include "apk_defines.h"
--
2.10.0
---
Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org
Help: alpine-devel+help@lists.alpinelinux.org
---
---
Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org
Help: alpine-devel+help@lists.alpinelinux.org
---
Applied, thanks.
William
On Fri, Jul 28, 2017 at 6:20 PM, A. Wilcox <awilfox@adelielinux.org> wrote:
[alpine-devel] [PATCH apk-tools 2/2] index: Only rewrite arch if no error is encountered
Export this patch
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
---
src/index.c | 4 ++ --
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/index.c b/src/index.c
index 45d371b..4dd69cb 100644
--- a/src/index.c
+++ b/src/index.c
@@ -192,9 +192,9 @@ static int index_main(void *ctx, struct apk_database *db, struct apk_string_arra
errors++;
} else {
newpkgs++;
+ if (ictx->rewrite_arch != NULL)
+ pkg->arch = ictx->rewrite_arch;
}
- if (ictx->rewrite_arch != NULL)
- pkg->arch = ictx->rewrite_arch;
apk_sign_ctx_free(&sctx);
}
}
--
2.10.0
---
Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org
Help: alpine-devel+help@lists.alpinelinux.org
---
---
Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org
Help: alpine-devel+help@lists.alpinelinux.org
---
Applied, thanks.
William
On Fri, Jul 28, 2017 at 6:20 PM, A. Wilcox <awilfox@adelielinux.org> wrote: