To: vim_dev@googlegroups.com
Subject: Patch 9.0.1548
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.1548
Problem:    CI: check in sound-dummy module may throw an error.
Solution:   Check whether apt-cache can show the package description.
            (Christian Brabandt, closes #12390)
Files:      .github/workflows/ci.yml


*** ../vim-9.0.1547/.github/workflows/ci.yml	2023-05-12 18:47:25.037299369 +0100
--- .github/workflows/ci.yml	2023-05-13 11:51:28.902043319 +0100
***************
*** 180,187 ****
            DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }}
          run: |
            cd /lib/modules/${{ env.LINUX_VERSION }}
!           if [ sudo apt-get install -d -y linux-modules-extra-${{ env.LINUX_VERSION }} 2>&1 | $(grep "Unable to locate package ") ]; then
!           echo "Download of " linux-modules-extra-${{ env.LINUX_VERSION }} "failed continue anyway" exit 0
            else
            sudo apt-get install -d -y linux-modules-extra-${{ env.LINUX_VERSION }}
            sudo dpkg -x /var/cache/apt/archives/linux-modules-extra-${{ env.LINUX_VERSION }}*.deb "${DEST_DIR}"
--- 180,187 ----
            DEST_DIR: ${{ env.TMPDIR }}/linux-modules-extra-${{ env.LINUX_VERSION }}
          run: |
            cd /lib/modules/${{ env.LINUX_VERSION }}
!           if apt-cache show linux-modules-extra-${{ env.LINUX_VERSION }} >/dev/null 2>&1 ; then
!           echo "Module " linux-modules-extra-${{ env.LINUX_VERSION }} "doesn't seem to exist, continue anyway"; exit 0
            else
            sudo apt-get install -d -y linux-modules-extra-${{ env.LINUX_VERSION }}
            sudo dpkg -x /var/cache/apt/archives/linux-modules-extra-${{ env.LINUX_VERSION }}*.deb "${DEST_DIR}"
*** ../vim-9.0.1547/src/version.c	2023-05-12 18:47:25.041299376 +0100
--- src/version.c	2023-05-13 11:54:23.192643855 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1548,
  /**/

-- 
Tips for aliens in New York: Land anywhere.  Central Park, anywhere.
No one will care or indeed even notice.
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///