Merge lp:~altair-ibn-la-ahad/update-notifier/bug-887650 into lp:update-notifier/ubuntu

[Andreas Altaïr Redmer]

fix for bug lp:887650

[lp:~altair-ibn-la-ahad/update-notifier/bug-887650]

783. By Andreas Altaïr Redmer on 2013-03-12

* using $(command) instead of `command`
* using dpkg --compare-versions to compare the Ubuntu versions

[Brian Murray (brian-murray)]

It'd actually be easier to use the file in $mount_point/.disk/info as a simple awk {'print $2'} would return the release.

[Brian Murray (brian-murray)]

This check should also be done outside of the dist-upgrader loop so that the package management dialog is not presented for a media with packages older than the current release.

[Brian Murray (brian-murray)]

I've gone ahead and merged your branch and made the changes I mentioned. Thanks for you work on this.

review: Approve

[Sebastien Bacher (seb128)]

@Brian: there was an issue with the patch (both here and in the commited version), the $mount_point needed to be put under "" otherwise it wouldn't work with CDs with spaces in their title (e.g "Ubuntu 12.10"). I've uploaded the version including the fix to raring

[Andreas Altaïr Redmer (altair-ibn-la-ahad)]

@Brian: Thanks for your help, but I think you did something wrong. My fix checked the release information in all the dist-directories of the media. It was intended to be in the loop, because if there is any better version on the media, it will offer to update. There was no misbehaviour for older packages.

This is case happens if you create a USB stick with 2 distros (e.g. precise and orienic). I have had tested it with such a USB stick. But maybe noone else than me would do that ?!

If you agree, you can put that awk line back in the loop.

Cheers.

=== modified file 'data/apt-cdrom-check'
--- data/apt-cdrom-check	2013-01-31 00:46:48 +0000
+++ data/apt-cdrom-check	2013-03-12 13:04:26 +0000
@@ -78,7 +78,14 @@
         if $GPG "$d/"*.tar.gz.gpg "$d"/*.tar.gz; then
 	# verified ok, we have a valid upgrader, if it was not ok, the
 	# fallback to the end is ok because we still have packages on it
-	    exit 2
+
+	#LP Bug 887650: check if the version on the CD is older
+	THIS_VERSION=$(lsb_release -sr)
+	VERSION_ON_CD=$(grep "Version" $mount_point/dists/*/Release | head -n1 | egrep -o "[0-9.]*")
+	# return 2 if the version on CD is newer
+	if dpkg --compare-versions "$THIS_VERSION" lt "$VERSION_ON_CD"; then
+		exit 2
+		fi;
         fi
     fi
 done

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-01 16:57:15 +0000
+++ debian/changelog	2013-03-12 13:04:26 +0000
@@ -1,3 +1,9 @@
+update-notifier (0.132ubuntu1) precise; urgency=low
+
+  * data/apt-cdrom-check: return 2 if the version on CD is newer (fixes LP: #887650)
+
+ -- Andreas Altaïr Redmer <[e-mail]>  Sun, 10 Mar 2013 21:24:46 +0800
+
 update-notifier (0.132) UNRELEASED; urgency=low
 
   [ Colin Watson ]