master merge

This commit is contained in:
Yorick Barbanneau 2018-05-02 11:10:53 +02:00
commit 2687387c42
2 changed files with 4 additions and 5 deletions

View file

@ -1,3 +1,3 @@
Package: libreoffice libreoffice-gtk3 libreoffice-l10n-fr Package: libreoffice libreoffice-gtk3 libreoffice-l10n-fr
in: release n=stretch-backports Pin: release n=stretch-backports
Pin-Priority: 991 Pin-Priority: 991

View file

@ -16,8 +16,7 @@ for i in $(ls conf/*.conf)
do do
source $i source $i
done done
message "$FI_PROXY_PASS\n"
exit 0
erase_display_char () { erase_display_char () {
let "i=0" let "i=0"
while [ $i -lt $1 ]; do while [ $i -lt $1 ]; do
@ -130,8 +129,8 @@ cp ./files/apt/80-* /etc/apt/preferences.d/
message "done\n" "ok" message "done\n" "ok"
#apt-get update &>/dev/null apt-get update &>/dev/null
#process_package_file files/packages.list process_package_file files/packages.list
message "Activate unattended upgrades : " message "Activate unattended upgrades : "
cp ./files/apt/20auto-upgrades /etc/apt/apt.conf.d/ cp ./files/apt/20auto-upgrades /etc/apt/apt.conf.d/