projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Group removal of orphaned packages.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
deffe51
..
209d79a
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-793,9
+793,8
@@
apt_listchanges () {
;;
enable)
;;
enable)
- if [ -f $file.disabled ]; then
- dpkg-divert --rename --remove $file || true
- fi
+ # cleanup the diversion even if the file is already removed
+ dpkg-divert --rename --remove $file || true
;;
esac
done
;;
esac
done
@@
-829,15
+828,20
@@
is_orphaned () {
# remove old and unused libraries
remove_orphaned () {
# remove old and unused libraries
remove_orphaned () {
- local package
+ local package remove
apt_autoremove
apt_autoremove
+ remove=
for package in $orphaned_packages; do
if is_orphaned $package; then
for package in $orphaned_packages; do
if is_orphaned $package; then
- pkgrm $package
+ remove="$remove $package"
fi
done
fi
done
+
+ if [ "$remove" ]; then
+ pkgrm $remove
+ fi
}
# monit it causing problems for postinst scripts
}
# monit it causing problems for postinst scripts