Merge with pacnew for pacman 6

This commit is contained in:
RealStickman 2021-06-07 09:37:31 +02:00
parent b1d0fddbbd
commit d4b029b01d
2 changed files with 10 additions and 13 deletions

View File

@ -15,15 +15,14 @@
#LogFile = /var/log/pacman.log #LogFile = /var/log/pacman.log
#GPGDir = /etc/pacman.d/gnupg/ #GPGDir = /etc/pacman.d/gnupg/
#HookDir = /etc/pacman.d/hooks/ #HookDir = /etc/pacman.d/hooks/
HoldPkg = pacman glibc HoldPkg = pacman glibc
#XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled #CleanMethod = KeepInstalled
#UseDelta = 0.7
Architecture = auto Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
IgnorePkg = packettracer #IgnorePkg =
#IgnoreGroup = #IgnoreGroup =
#NoUpgrade = #NoUpgrade =
@ -32,11 +31,11 @@ IgnorePkg = packettracer
# Misc options # Misc options
#UseSyslog #UseSyslog
Color Color
#TotalDownload #NoProgressBar
#CheckSpace CheckSpace
VerbosePkgLists VerbosePkgLists
ILoveCandy ILoveCandy
ParallelDownloads=5 ParallelDownloads = 5
# By default, pacman accepts packages signed by keys that its local keyring # By default, pacman accepts packages signed by keys that its local keyring
# trusts (see pacman-key and its man page), as well as unsigned packages. # trusts (see pacman-key and its man page), as well as unsigned packages.
@ -100,4 +99,3 @@ Include = /etc/pacman.d/mirrorlist
#[custom] #[custom]
#SigLevel = Optional TrustAll #SigLevel = Optional TrustAll
#Server = file:///home/custompkgs #Server = file:///home/custompkgs

View File

@ -19,11 +19,10 @@ HoldPkg = pacman glibc
#XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/curl -C - -f %u > %o
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled #CleanMethod = KeepInstalled
#UseDelta = 0.7
Architecture = auto Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
IgnorePkg = packettracer #IgnorePkg =
#IgnoreGroup = #IgnoreGroup =
#NoUpgrade = #NoUpgrade =
@ -32,11 +31,11 @@ IgnorePkg = packettracer
# Misc options # Misc options
#UseSyslog #UseSyslog
Color Color
#TotalDownload #NoProgressBar
#CheckSpace CheckSpace
VerbosePkgLists VerbosePkgLists
ILoveCandy ILoveCandy
ParallelDownloads=5 ParallelDownloads = 5
# By default, pacman accepts packages signed by keys that its local keyring # By default, pacman accepts packages signed by keys that its local keyring
# trusts (see pacman-key and its man page), as well as unsigned packages. # trusts (see pacman-key and its man page), as well as unsigned packages.