Merge lp:~darkxst/ppa-purge/multiarch-lp892886 into lp:ppa-purge

[Tim]

uses dpkg-query to extract the actual multiarch package names (where applicable). This lets ppa-purge work correctly on multiarch systems.

[Tormod Volden (tormodvolden)]

Thanks for this! I would maybe had strengthened the /ii/ regex to prevent matching on some unfortunate package name.

Can you please also add a package dependency on whatever version of dpkg-query is needed for this?

[Tim (darkxst)]

I will check tomorrow if I can strengthen the regex.

However dpkg-query is a core part of dpkg (i.e. what handles dpkg -l package), so no extra dependency should be needed.

[Tormod Volden (tormodvolden)]

Something like /\tii$/ should be enough since you use a "\t" in your -f string.

I was thinking of a /versioned/ dependency, since the -f format parameters you are using are not supported in older dpkg. This would break backports of ppa-purge.

[lp:~darkxst/ppa-purge/multiarch-lp892886]

58. By Tim on 2012-11-16

stengthen regex and add dependency

[Tim (darkxst)]

Added a dependency on the correct version of dpkg, turns out the required format fields are only available in Quantal and Raring

[Tim (darkxst)]

The following provides a similar result on Precise, perhaps we should fallback to that if the current dpkg-query fails.

-f='${PackageSpec}\t${Status}\n'

[lp:~darkxst/ppa-purge/multiarch-lp892886]

59. By Tim on 2012-11-17

Add support for multiarch on Precise

60. By Tim on 2012-11-17

correct reverst list generation on Precise

[Tim (darkxst)]

r59 and r60 correctly generate the package revert list on multiarch Precise. It may work with apt-get however aptitude is completely broken on Precise with respect to multiarch dependency resolution (LP: #831768). Also its probably not ideal hardcoding the foreign arch, but I couldnt work out how to get this info under precise.

So probably best to just merge r57+r58 for now, which atleast cover Q and R

[lp:~darkxst/ppa-purge/multiarch-lp892886]

61. By Tim on 2012-11-21

cleanup of precise support.

[Tim (darkxst)]

Cleaned up a bit and tested on precise with the patched aptitude (LP: 831768) that is awaiting upload for SRU. In combination with that patch, this is now working perfectly.

[Tormod Volden (tormodvolden)]

Awesome! What about a versioned dependency on this aptitude package?

You may also delete the ARCH variable at the same time since it is not used.

[lp:~darkxst/ppa-purge/multiarch-lp892886]

62. By Tim on 2012-11-21

remove unused ARCH variable

63. By Tim on 2012-11-21

update depends

[Tim (darkxst)]

ok done.

[Tormod Volden (tormodvolden)]

From looking at http://manpages.ubuntu.com/manpages/natty/man1/dpkg.1.html it seems like --print-foreign-architectures and PackageSpec was available already in dpkg_1.16.0~ubuntu7_i386 - in case it should work on natty and oneiric as well.

I would love to see a fallback that works in 10.04 as well, but that can be added later. It is more important to get this version out soon.

[Tormod Volden (tormodvolden)]

But then for natty and oneiric we would need backports of that aptitude package as well...

I have neither multiarch fu nor a multiarch system to test on, but otherwise this looks good to me.

review: Approve

[Tim (darkxst)]

Yes, would need to get the aptitude patch backported to get it working on natty and oneiric.

[Robert Hooker (sarvatt)]

Ok I just checked it out and this works, but there is a problem in that packages that only existed in the PPA and not in the distro do not get removed which makes it not work with xorg-edgers thanks to libdrm-nouveau2 in precise. That's a problem for another day though and this does work for most use cases :) Thanks for this Tim! I'm not able to upload it so I subscribed the sponsors team to the bug.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-10 20:13:14 +0000
+++ debian/changelog	2012-11-21 09:41:37 +0000
@@ -1,3 +1,9 @@
+ppa-purge (0.2.8+bzr57) raring; urgency=low
+
+  * Generate a multiarch aware package revert list (LP: 892886) 
+
+ -- Tim Lunn <[e-mail]>  Fri, 16 Nov 2012 10:43:20 +1100
+
 ppa-purge (0.2.8+bzr56) natty; urgency=low
 
   * Really implement the "-y" option.

=== modified file 'debian/control'
--- debian/control	2010-10-15 21:22:59 +0000
+++ debian/control	2012-11-21 09:41:37 +0000
@@ -8,7 +8,7 @@
 
 Package: ppa-purge
 Architecture: all
-Depends: ${misc:Depends}, aptitude
+Depends: ${misc:Depends}, aptitude (>= 0.6.6-1ubuntu1.2), dpkg (>= 1.16.1)
 Description: disables a PPA and reverts to official packages
  This program disables a PPA from your Software Sources and reverts your
  system back to the official Ubuntu packages. You can use this to return your 

=== modified file 'ppa-purge'
--- ppa-purge	2010-11-10 20:13:14 +0000
+++ ppa-purge	2012-11-21 09:41:37 +0000
@@ -5,7 +5,7 @@
 # AUTHORS: Robert Hooker (Sarvatt), Tormod Volden
 
 # Defaults
-ARCH=$(dpkg --print-architecture)
+F_ARCHS=$(dpkg --print-foreign-architectures)
 PPA_PKGS=$(mktemp)
 REVERTS=$(mktemp)
 trap "rm $PPA_PKGS $REVERTS" 0
@@ -127,8 +127,21 @@
 	msg "Note: Not removing ppa-purge package"
 fi
 
-dpkg --get-selections | awk '/install$/{print $1}' |
-     sort | comm -12 - $PPA_PKGS > $REVERTS
+# Get multi-arch package names for revert list
+cat $PPA_PKGS | sort -u |  
+    xargs dpkg-query -W -f='${binary:Package}\t${db:Status-Abbrev}\n' 2>/dev/null |
+    awk '/\tii $/{print $1}' > $REVERTS
+# Fallback for Precise
+if [ ! -s $REVERTS ]; then
+    for PACKAGE in $(cat $PPA_PKGS | sort -u); do
+        dpkg-query -W -f='${PackageSpec}\t${Status}\n' $PACKAGE 2>/dev/null |
+            awk '/\tinstall/{print $1}' >> $REVERTS
+        for F_ARCH in $F_ARCHS; do 
+            dpkg-query -W -f='${PackageSpec}\t${Status}\n' "$PACKAGE:$F_ARCH" 2>/dev/null |
+                awk '/\tinstall/{print $1}' >> $REVERTS
+        done 
+	done
+fi
 
 # Create apt argument list for reverting packages
 REINSTALL=""