For discussion of Alpine Linux development and developer support

3 2

[alpine-devel] [PATCH apk-tools 1/2] database: include POSIX header for ST_* defines

A. Wilcox
Details
Message ID
<20170728232022.24444-1-awilfox@adelielinux.org>
Sender timestamp
1501284021
DKIM signature
missing
Download raw message
Patch: +1 -0
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
---

[alpine-devel] [PATCH apk-tools 2/2] index: Only rewrite arch if no error is encountered

A. Wilcox
Details
Message ID
<20170728232022.24444-2-awilfox@adelielinux.org>
In-Reply-To
<20170728232022.24444-1-awilfox@adelielinux.org> (view parent)
Sender timestamp
1501284022
DKIM signature
missing
Download raw message
Patch: +2 -2
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
---
William Pitcock
Details
Message ID
<CA+T2pCG9=tBLkfo+UMLtCT3E75qaM6PvxSwhE9vapgAUjoGRug@mail.gmail.com>
In-Reply-To
<20170728232022.24444-1-awilfox@adelielinux.org> (view parent)
Sender timestamp
1501300392
DKIM signature
missing
Download raw message
Applied, thanks.

William

On Fri, Jul 28, 2017 at 6:20 PM, A. Wilcox <awilfox@adelielinux.org> wrote:
> 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
---

Re: [alpine-devel] [PATCH apk-tools 2/2] index: Only rewrite arch if no error is encountered

William Pitcock
Details
Message ID
<CA+T2pCGX8HWMF3Z9nwFg-SnX4xHfVXGgdqaUw-sj5UjCmvWoYQ@mail.gmail.com>
In-Reply-To
<20170728232022.24444-2-awilfox@adelielinux.org> (view parent)
Sender timestamp
1501300413
DKIM signature
missing
Download raw message
Applied, thanks.

William

On Fri, Jul 28, 2017 at 6:20 PM, A. Wilcox <awilfox@adelielinux.org> wrote:
> 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
---