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

[Tim Lunn]

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

60. By Tim Lunn on 2014-11-15

add bug ref

61. By Tim Lunn on 2014-12-11

reformat with tabs

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-30 10:12:27 +0000
+++ debian/changelog	2014-12-11 21:31:44 +0000
@@ -1,3 +1,10 @@
+ppa-purge (0.2.8+bzr58~trusty1) trusty; urgency=medium
+
+  * Add some logic to handle packages that have had a soname bump, packages with
+    manual renames will still break, however these should be pretty rare. (LP: #1392954)
+
+ -- Tim Lunn <[e-mail]>  Sat, 15 Nov 2014 18:32:51 +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	2014-12-11 21:31:44 +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}, aptitude (>= 0.6.6-1ubuntu1.2), dpkg (>= 1.16.1), dctrl-tools
 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	2014-12-11 21:31:44 +0000
@@ -143,31 +143,51 @@
 	done
 fi
 
-# Create apt argument list for reverting packages
+# Disable PPA from sources.list files
+for LIST in $(find /etc/apt/ -name "*.list" -exec readlink -f '{}' \;); do
+	if [ -e $LIST ] && grep -q $PPAOWNER/$PPANAME $LIST; then
+		msg "Disabling $PPAOWNER PPA from $LIST"
+		sed -ri "\:^[^#]+/${PPAOWNER}/${PPANAME}/:s/^deb/# deb/" $LIST
+	fi
+done
+
+msg "Updating packages lists"
+$APT update > /dev/null || warn "$APT update failed for some reason"
+
+# Create apt argument list for reverting packages, most of the foo here is to attempt
+# to unroll soname bumps
+
 REINSTALL=""
 for PACKAGE in $(cat $REVERTS); do
-	REINSTALL="$REINSTALL $PACKAGE/$DIST"
+	PKG=$(echo $PACKAGE | cut -d ':' -f1)
+	[[ $PACKAGE == *:* ]] && D_ARCH=":"$(echo $PACKAGE | cut -d ':' -f2)
+
+	if [ $(grep-aptavail -XPc -s Package $PKG) -eq 0 ]; then
+		PAT=$(echo $PKG | sed -e s/[0-9][a-z]\$/'..'/ -e s/[0-9]/'.'/g)
+
+		APTAVAIL=$(grep-aptavail -eP  --pattern=$PAT'$' -s Package -n | sort -uV | sed -e '$!d')
+
+		#explicitly remove packages that don't exist in archive
+		if [ "x$APTAVAIL" != "x$PKG" ]; then
+			REINSTALL="$REINSTALL $PACKAGE-"
+		fi
+
+		#downgrade packages that have a soname bump
+		if [ -n "$APTAVAIL" ]; then
+			REINSTALL="$REINSTALL $APTAVAIL$D_ARCH/$DIST"
+		fi
+	else
+		REINSTALL="$REINSTALL $PACKAGE/$DIST"
+	fi
 done
 
 msg "Package revert list generated:"
 msg "$REINSTALL"
 echo
 
-# Disable PPA from sources.list files
-for LIST in $(find /etc/apt/ -name "*.list" -exec readlink -f '{}' \;); do
-	if [ -e $LIST ] && grep -q $PPAOWNER/$PPANAME $LIST; then
-		msg "Disabling $PPAOWNER PPA from $LIST"
-		sed -ri "\:^[^#]+/${PPAOWNER}/${PPANAME}/:s/^deb/# deb/" $LIST
-	fi
-done
-
-msg "Updating packages lists"
-$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. APTALT is a little more foregiving if the
+# revert list isn't 100% correct.
 
 if $APT $APTARG install $REINSTALL; then
 	msg "PPA purged successfully"