From 522f71ff1e65868d66fe6e6535c3228cecfff6b8 Mon Sep 17 00:00:00 2001
From: philsmd <921533+philsmd@users.noreply.github.com>
Date: Tue, 13 Feb 2018 19:25:23 +0100
Subject: [PATCH 1/2] appveyor: remove conflicting package "catgets"

this is a temporary fix: since the package "catgets" conflicts with msys2-runtime, we need to remove it before a full upgrade.
---
 .appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index bf9da44e1..e4ba3c02e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -32,6 +32,8 @@ init:
 install:
   - ps: if (Test-Path Env:\CYG_ROOT) { Start-FileDownload "http://cygwin.com/$env:CYG_SETUP" -FileName "$env:CYG_SETUP" }
   - if defined CYG_ROOT (%CYG_SETUP% --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages "%CYG_PACKAGES%" --upgrade-also)
+  # remove the conflicting package "catgets" (it conflicts with msys2-runtime)
+  - if defined MSYSTEM (%BASH% -lc "pacman -Rns catgets --noconfirm"
   - if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm")
   # the following line is not a duplicate line:
   # it is necessary to upgrade the MSYS base files and after that all the packages

From 265dae0d6b5079421f6f8e44459b4f96869a5df3 Mon Sep 17 00:00:00 2001
From: philsmd <921533+philsmd@users.noreply.github.com>
Date: Tue, 13 Feb 2018 19:26:39 +0100
Subject: [PATCH 2/2] Update .appveyor.yml

typo
---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e4ba3c02e..78fbb3100 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -33,7 +33,7 @@ install:
   - ps: if (Test-Path Env:\CYG_ROOT) { Start-FileDownload "http://cygwin.com/$env:CYG_SETUP" -FileName "$env:CYG_SETUP" }
   - if defined CYG_ROOT (%CYG_SETUP% --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages "%CYG_PACKAGES%" --upgrade-also)
   # remove the conflicting package "catgets" (it conflicts with msys2-runtime)
-  - if defined MSYSTEM (%BASH% -lc "pacman -Rns catgets --noconfirm"
+  - if defined MSYSTEM (%BASH% -lc "pacman -Rns catgets --noconfirm")
   - if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm")
   # the following line is not a duplicate line:
   # it is necessary to upgrade the MSYS base files and after that all the packages