Want more features on Pastebin? Sign Up, it's FREE!
Guest

pacman.conf-pacnew-merge

By: PastersGonnaPaste on Oct 19th, 2011  |  syntax: None  |  size: 1.67 KB  |  views: 603  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. [root@archy etc]# git diff pacman.conf
  2. diff --git a/pacman.conf b/pacman.conf
  3. index fcfdf15..5e305a8 100644
  4. --- a/pacman.conf
  5. +++ b/pacman.conf
  6. @@ -13,11 +13,12 @@
  7.  #DBPath      = /var/lib/pacman/
  8.  #CacheDir    = /var/cache/pacman/pkg/
  9.  #LogFile     = /var/log/pacman.log
  10. +#GPGDir      = /etc/pacman.d/gnupg/
  11.  HoldPkg     = pacman glibc
  12.  # If upgrades are available for these packages they will be asked for first
  13.  SyncFirst   = pacman
  14. -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
  15.  #XferCommand = /usr/bin/curl -C - -f %u > %o
  16. +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
  17.  #CleanMethod = KeepInstalled
  18.  Architecture = auto
  19.  
  20. @@ -28,12 +29,23 @@ Architecture = auto
  21.  #NoUpgrade   =
  22.  #NoExtract   =
  23.  
  24. -# Misc options (all disabled by default)
  25. +# Misc options
  26.  #UseSyslog
  27. -#ShowSize
  28.  #UseDelta
  29.  #TotalDownload
  30. -#CheckSpace
  31. +CheckSpace
  32. +#VerbosePkgLists
  33. +
  34. +# PGP signature checking
  35. +# NOTE: None of this will work without running `pacman-key --init` first.
  36. +# The compiled in default is equivalent to the following line. This requires
  37. +# you to locally sign and trust packager keys using `pacman-key` for them to be
  38. +# considered valid.
  39. +#SigLevel = Optional TrustedOnly
  40. +# If you wish to check signatures but avoid local sign and trust issues, use
  41. +# the following line. This will treat any key imported into pacman's keyring as
  42. +# trusted.
  43. +#SigLevel = Optional TrustAll
  44.  
  45.  #
  46.  # REPOSITORIES
  47. @@ -76,5 +88,6 @@ Include = /etc/pacman.d/mirrorlist
  48.  # An example of a custom package repository.  See the pacman manpage for
  49.  # tips on creating your own repositories.
  50.  #[custom]
  51. +#SigLevel = Optional TrustAll
  52.  #Server = file:///home/custompkgs
  53.  
  54.  
clone this paste RAW Paste Data