Merge lp:~darkxst/ppa-purge/lp706774 into lp:ppa-purge

[Tim Lunn]

Specify removal of packages (via $REINSTALL) that don't exist in the ubuntu archives. This allows apt-get to handle the ppa purge in most cases.

I have removed the dependency on aptitude, however leaving the fallback code in the script, since there may be rare cases where apt-get will fail if for some reason we are left with missing/unsatisfied dependencies. Although I have not seen this happen in my testing.

[lp:~darkxst/ppa-purge/lp706774]

62. By Tim Lunn on 2012-12-03

update grep expression

[Tim Lunn (darkxst)]

Would be good to get this merged. I have noticed some cases where aptitude still fails to work 100% correctly, when running without this patch.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-30 10:12:27 +0000
+++ debian/changelog	2012-12-03 00:32:20 +0000
@@ -1,3 +1,9 @@
+ppa-purge (0.2.8+bzr57ubuntu1) raring; urgency=low
+
+  * Specify removal of packages that don't exist in Ubuntu (LP: #706774) 
+
+ -- Tim Lunn <[e-mail]>  Fri, 30 Nov 2012 08:25:57 +1100
+
 ppa-purge (0.2.8+bzr57) raring; urgency=low
 
   [ Tim Lunn ]

=== modified file 'debian/control'
--- debian/control	2012-11-30 10:12:27 +0000
+++ debian/control	2012-12-03 00:32:20 +0000
@@ -8,7 +8,7 @@
 
 Package: ppa-purge
 Architecture: all
-Depends: ${misc:Depends}, aptitude (>= 0.6.6-1ubuntu1.2), dpkg (>= 1.16.1)
+Depends: ${misc:Depends}, 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	2012-11-21 09:30:49 +0000
+++ ppa-purge	2012-12-03 00:32:20 +0000
@@ -104,7 +104,10 @@
 fi
 
 msg "Updating packages lists"
-$APT update > /dev/null || warn "$APT update failed for some reason"
+if ! $APT update > /dev/null; then 
+    warn "$APT update failed for some reason"
+    exit 1
+fi
 
 msg "PPA to be removed: $PPAOWNER $PPANAME"
 
@@ -146,7 +149,12 @@
 # Create apt argument list for reverting packages
 REINSTALL=""
 for PACKAGE in $(cat $REVERTS); do
-	REINSTALL="$REINSTALL $PACKAGE/$DIST"
+    AVAIL=$(apt-cache policy $PACKAGE | grep -v "$PPAHOST/$PPAOWNER/$PPANAME" | grep -c "500.*$DIST"  )
+    if [ $AVAIL -eq 0 ]; then
+        REINSTALL="$REINSTALL $PACKAGE-"
+    else
+        REINSTALL="$REINSTALL $PACKAGE/$DIST"
+    fi
 done
 
 msg "Package revert list generated:"
@@ -165,9 +173,7 @@
 $APT update > /dev/null || warn "$APT update failed for some reason"
 
 # FIXME:
-# Workaround for now in case APT fails because of a package not in Ubuntu.
-# APTALT actually works but it would be preferred to remove the package
-# from $REINSTALL directly.
+# Workaround for now in case APT fails because of missing dependencies.
 
 if $APT $APTARG install $REINSTALL; then
 	msg "PPA purged successfully"