From e8d0ee263384537422a35834e5eb27718fd841bd Mon Sep 17 00:00:00 2001
From: Andrea Valassi <andrea.valassi@cern.ch>
Date: Wed, 8 Nov 2017 17:15:18 +0100
Subject: [PATCH] Add pkg versions and add all installed pkgs

---
 .gitlab-ci-ubuntu.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci-ubuntu.sh b/.gitlab-ci-ubuntu.sh
index 422e5ed..0a33d00 100755
--- a/.gitlab-ci-ubuntu.sh
+++ b/.gitlab-ci-ubuntu.sh
@@ -79,16 +79,20 @@ if [ "${brn}" == "ubuntu1604" ] || [ "${brn}" == "ubuntu1704" ]; then
   # Dump the list of newly installed packages
   # (compare packages in O/S before and after installation of meta-package)
   apt list --installed > tmp0.txt
+  dpkg-query -Wf '${binary:Package} ${Version}\n' > tmp0v.txt
   dpkg-query -Wf '${binary:Package} ${Installed-Size}\n' > tmp0s.txt
   if ! apt-get -qy install ./${deb64} > tmplog.txt; then cat tmplog.txt; echo "ERROR! ${deb64} could not be installed"; exit 1; else mv tmplog.txt ./${dep64}.installation-log.txt; echo "${deb64} has been installed"; fi 
   ###if ! apt-get -qy install ./${deb64}; then echo "ERROR! ${deb64} could not be installed"; exit 1; else echo "${deb64} has been installed"; fi 
   ###if ! apt-get -qy install ./${deb64} | tee ./${dep64}.installation-log.txt; then echo "ERROR! ${deb64} could not be installed"; exit 1; else echo "${deb64} has been installed"; fi 
   apt list --installed > tmp1.txt
+  dpkg-query -Wf '${binary:Package} ${Version}\n' > tmp1v.txt
   dpkg-query -Wf '${binary:Package} ${Installed-Size}\n' > tmp1s.txt
   (! diff tmp0.txt tmp1.txt ) | grep "^>" | grep -v heposlibs | awk '{split($2,p,"/"); print p[1]}' | sort -u > ./${dep64}.dependencies-installed.txt # apt list gives e.g. "pkg/xenial"
-  (! diff tmp0s.txt tmp1s.txt ) | grep "^>" | grep -v heposlibs | awk '{print $2, $3}' | sort -u > tmp2s.txt
+  (! diff tmp0v.txt tmp1v.txt ) | grep "^>" | grep -v heposlibs | awk '{printf "%-48s %s\n", $2, $3}' | sort -u > ./${dep64}.dependencies-installed-nvra.txt
+  (! diff tmp0s.txt tmp1s.txt ) | grep "^>" | grep -v heposlibs | awk '{printf "%-48s %12s\n", $2, $3}' | sort -u > tmp2s.txt
   awk '{s+=$2}END{print "HEP_OSlibs total_installed_size(kbytes): "s"\n"}' tmp2s.txt > ./${dep64}.dependencies-installed-size.txt # kbytes (https://www.debian.org/doc/debian-policy/#s-f-installed-size)
   cat tmp2s.txt >> ./${dep64}.dependencies-installed-size.txt
+  cat tmp1v.txt | awk '{printf "%-48s %s\n", $1, $2}' | sort -u > ./${dep64}.all-installed-nvra.txt
 
   # Dump the list of direct dependencies of the meta-package
   apt-cache depends ${nam} | awk '{if ($1=="Depends:") print $2}' | sort -u > ./${dep64}.dependencies-direct.txt
-- 
GitLab