Re: [PATCH cygport 0/2] Add provides: and conflicts:

2020-04-06 Thread Yaakov Selkowitz via Cygwin-apps
On Sun, 2020-04-05 at 15:17 +0100, Jon Turney wrote:
> It seems I missed updating the check that all the expected package files 
> exist for source package hints.
> 
> Patch attached (without this upload isn't permitted when there's no 
> pvr.tar.xz, as no corresponding hint exists, only pvr-src.tar.xz and 
> it's hint).

Thanks, pushed to master.

-- 
Yaakov Selkowitz
Senior Software Engineer - Platform Enablement
Red Hat, Inc.




Re: [PATCH cygport 0/2] Add provides: and conflicts:

2020-04-06 Thread Yaakov Selkowitz
On Sun, 2020-04-05 at 15:17 +0100, Jon Turney wrote:
> It seems I missed updating the check that all the expected package files 
> exist for source package hints.
> 
> Patch attached (without this upload isn't permitted when there's no 
> pvr.tar.xz, as no corresponding hint exists, only pvr-src.tar.xz and 
> it's hint).

Thanks, pushed to master.

--
Yaakov




Re: [PATCH cygport 0/2] Add provides: and conflicts:

2020-04-05 Thread Jon Turney

On 24/03/2020 03:07, Yaakov Selkowitz wrote:

On Sat, 2020-02-08 at 13:46 +, Jon Turney wrote:

Pushed to master, please test.



It seems I missed updating the check that all the expected package files 
exist for source package hints.


Patch attached (without this upload isn't permitted when there's no 
pvr.tar.xz, as no corresponding hint exists, only pvr-src.tar.xz and 
it's hint).


From 3452858101ea09a336e6fff02362acaeb7a76ba0 Mon Sep 17 00:00:00 2001
From: Jon Turney 
Date: Sun, 5 Apr 2020 15:06:17 +0100
Subject: [PATCH cygport] Update upload package check for source hints

Update the upload package check for separate source hints (15b8d061)
---
 lib/pkg_upload.cygpart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkg_upload.cygpart b/lib/pkg_upload.cygpart
index ab49398..f4763d7 100644
--- a/lib/pkg_upload.cygpart
+++ b/lib/pkg_upload.cygpart
@@ -81,7 +81,7 @@ __pkg_upload() {
 
# Check that binary and source package files exist
 
-   pkg_files=("${NAME}/${NAME}-${PVR}-src.tar.xz" 
"${NAME}/${NAME}-${PVR}.hint")
+   pkg_files=("${NAME}/${NAME}-${PVR}-src.tar.xz" 
"${NAME}/${NAME}-${PVR}-src.hint")
 
while (( n < pkg_count ))
do
-- 
2.21.0



Re: [PATCH cygport 0/2] Add provides: and conflicts:

2020-03-23 Thread Yaakov Selkowitz
On Sat, 2020-02-08 at 13:46 +, Jon Turney wrote:
> Add the ability to specify provides: and conflicts: hints in the cygport.
> 
> Jon Turney (2):
>   Add test which compares hints with expected
>   Add provides: and conflicts: hints
> 
>  lib/pkg_pkg.cygpart   | 74 ++-
>  testsuite/hints/meson.build   |  1 +
>  .../libmultiple-devel-3.14-1.hint |  6 ++
>  .../libmultiple1/libmultiple1-3.14-1.hint |  8 ++
>  .../dist/multiple/multiple-3.14-1.hint|  6 ++
>  testsuite/hints/multiple/multiple.cygport | 35 +
>  testsuite/hints/multiple/multiple.list|  1 +
>  .../obsoleted-by-single-2.3.4-1.hint  |  8 ++
>  .../dist/single/single-2.3.4-1.hint   |  8 ++
>  testsuite/hints/single/single.cygport | 25 +++
>  testsuite/hints/single/single.list|  1 +
>  testsuite/meson.build |  2 +
>  testsuite/test-driver | 17 -
>  13 files changed, 189 insertions(+), 3 deletions(-)
>  create mode 100644 testsuite/hints/meson.build
>  create mode 100644 
> testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/libmultiple-devel/libmultiple-devel-3.14-1.hint
>  create mode 100644 
> testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/libmultiple1/libmultiple1-3.14-1.hint
>  create mode 100644 
> testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/multiple-3.14-1.hint
>  create mode 100644 testsuite/hints/multiple/multiple.cygport
>  create mode 100644 testsuite/hints/multiple/multiple.list
>  create mode 100644 
> testsuite/hints/single/hints/single-2.3.4-1.x86_64/dist/single/obsoleted-by-single/obsoleted-by-single-2.3.4-1.hint
>  create mode 100644 
> testsuite/hints/single/hints/single-2.3.4-1.x86_64/dist/single/single-2.3.4-1.hint
>  create mode 100644 testsuite/hints/single/single.cygport
>  create mode 100644 testsuite/hints/single/single.list

Pushed to master, please test.

--
Yaakov




[PATCH cygport 0/2] Add provides: and conflicts:

2020-02-08 Thread Jon Turney
Add the ability to specify provides: and conflicts: hints in the cygport.

Jon Turney (2):
  Add test which compares hints with expected
  Add provides: and conflicts: hints

 lib/pkg_pkg.cygpart   | 74 ++-
 testsuite/hints/meson.build   |  1 +
 .../libmultiple-devel-3.14-1.hint |  6 ++
 .../libmultiple1/libmultiple1-3.14-1.hint |  8 ++
 .../dist/multiple/multiple-3.14-1.hint|  6 ++
 testsuite/hints/multiple/multiple.cygport | 35 +
 testsuite/hints/multiple/multiple.list|  1 +
 .../obsoleted-by-single-2.3.4-1.hint  |  8 ++
 .../dist/single/single-2.3.4-1.hint   |  8 ++
 testsuite/hints/single/single.cygport | 25 +++
 testsuite/hints/single/single.list|  1 +
 testsuite/meson.build |  2 +
 testsuite/test-driver | 17 -
 13 files changed, 189 insertions(+), 3 deletions(-)
 create mode 100644 testsuite/hints/meson.build
 create mode 100644 
testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/libmultiple-devel/libmultiple-devel-3.14-1.hint
 create mode 100644 
testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/libmultiple1/libmultiple1-3.14-1.hint
 create mode 100644 
testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/multiple-3.14-1.hint
 create mode 100644 testsuite/hints/multiple/multiple.cygport
 create mode 100644 testsuite/hints/multiple/multiple.list
 create mode 100644 
testsuite/hints/single/hints/single-2.3.4-1.x86_64/dist/single/obsoleted-by-single/obsoleted-by-single-2.3.4-1.hint
 create mode 100644 
testsuite/hints/single/hints/single-2.3.4-1.x86_64/dist/single/single-2.3.4-1.hint
 create mode 100644 testsuite/hints/single/single.cygport
 create mode 100644 testsuite/hints/single/single.list

-- 
2.21.0