pacman 4.0.3

1 files changed, 10 insertions, 21 deletions

diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install
index c066733..487819a 100644
--- a/abs/core/pacman/pacman.install
+++ b/abs/core/pacman/pacman.install
@@ -9,33 +9,22 @@ post_upgrade() {
     if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then
         _warnupgrade
     fi
-    _updateconf
-    echo ">>>"
-    echo ">>> ATTENTION! ATTENTION! ATTENTION!"
-    echo ">>> /etc/pacman.conf has changed. If you have customized your"
-    echo ">>> pacman.conf file, please merge your changes into"
-    echo ">>> /etc/pacman.conf.pacnew.  Backup your old pacman.conf and"
-    echo ">>> then move pacman.conf.pacnew to pacman.conf"
-    echo ">>>"
-}
-
-_updateconf() {
-    pacconf="/etc/pacman.conf"
-    #add SyncFirst
-    grep -q SyncFirst $pacconf
-    if [ $? -eq 1 ]
-    then
-        sed -i '/\[options\]/  a\SyncFirst = pacman ' $pacconf
+    if [ ! -f "etc/pacman.d/gnupg/pubring.gpg" ] || [ "$(vercmp $2 4.0.3-2)" -lt 0 ]; then
+        _check_pubring
     fi
-    #remove larch
-    sed -i '/larch/d' $pacconf
+}
 
+post_install() {
+    _check_pubring
 }
-    
 
+_check_pubring() {
+    echo " >>> Run  \`pacman-key --init; pacman-key --populate archlinux\`"
+    echo " >>> to import the data required by pacman for package verification."
+    echo " >>> See: https://www.archlinux.org/news/having-pacman-verify-packages"
+}
 
 _warnupgrade() {
-    echo ">>>"
     echo ">>> The pacman database format has changed as of pacman 3.5.0."
     echo ">>> You will need to run \`pacman-db-upgrade\` as root."
     echo ">>>"