Skip to content

Commit

Permalink
filter out ":amd64" string when comparing new installed packages name (
Browse files Browse the repository at this point in the history
…dell#47)

because of some installed package have postfix ":amd64", it will
confuse the logic of commit "f352bd" for dell#28 and treat it as a failure.

Signed-off-by: Alex Tu <alex.tu@canonical.com>
  • Loading branch information
Alex Tu committed Oct 25, 2017
1 parent 4e6799f commit 1db2fe5
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion late/scripts/chroot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ fi
#check the packages installed or not
if [ -f "$TARGET/tmp/apt-installed" ]; then
mv $TARGET/tmp/apt-installed $TARGET/var/lib/ubiquity/dell-apt
grep -x -f $TARGET/var/lib/ubiquity/dell-apt $TARGET/var/lib/ubiquity/installed-packages > $TARGET/var/lib/ubiquity/dell_installed
sed 's/:amd64//g' $TARGET/var/lib/ubiquity/installed-packages > $TARGET/var/lib/ubiquity/installed-packages-filtered
grep -x -f $TARGET/var/lib/ubiquity/dell-apt $TARGET/var/lib/ubiquity/installed-packages-filtered > $TARGET/var/lib/ubiquity/dell_installed
awk '{print $0}' $TARGET/var/lib/ubiquity/dell-apt $TARGET/var/lib/ubiquity/dell_installed |sort |uniq -u > $TARGET/var/lib/ubiquity/dell_uninstalled
fi

Expand Down

0 comments on commit 1db2fe5

Please sign in to comment.