Merge ~jarnos/ppa-purge:master into ppa-purge:master

[Jarno Suni]

Uses apt-get, not aptitude at all.

Aims to fix:
Under https://bugs.launchpad.net/ppa-purge
Bug #1614160
Bug #802853
Bug #1121325 (since it does not use aptitude)

Under https://bugs.launchpad.net/ubuntu/+source/ppa-purge
Bug #1408031
Bug #1548881
Bug #995113

+some fixes told in git log.

Donate to me on contributing to this project: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YYXVNC3L8QSQA

f302251... by Jarno Suni on 2016-12-14

Move check for not removing this package.

Now allow downgrading, though.

41b8698... by Jarno Suni on 2016-12-14

Read package lists to /dev/shm to avoid writing to permanent storage.

Rename PPA_PKGS -> PKGS. Empty the files after use. Do not sort
while reading PKGS.

dcbd763... by Jarno Suni on 2016-12-14

Do not display revert list (=$REINSTALL).

Reverts will be shown as part of executing the apt-get install
command.

7d5a2cf... by Jarno Suni on 2016-12-15

Simplify by using bash regex and variable expansion.

Get rid of some variables at the same time.

[Tim (darkxst)]

Turns out this is pretty hard to review, launchpad doesnt help but you also have several commits that revert or fix changes you made in subsequent commits.

Have made a couple of inline comments below.

Will also go through and cherry-pick some of the more trivial commits, but you will need to rebase your branch once done.

[Tim (darkxst)]

s/subsequent/previous/ commits

[Jarno Suni (jarnos)]

Unfortunately development was not completely straight-forward.

[Tim (darkxst)]

there are still commits you could squash to clean things up a bit

&&
complete

you remove then add back

there 2 commits that deal with escaping ppa string?

etc

[Jarno Suni (jarnos)]

Is there an easy way to cancel the removing of && so that there is no mention of it in git log disturbing your mind?

Is it a problem that there are 2 commits that deal with escaping ppa string? If you want less commits I could just commit the final code as one commit. But you did not accept that either.

65fb9fb... by Jarno Suni on 2016-12-18

Simplify messaging. No folding used.

5bece79... by Jarno Suni on 2016-12-18

Ask user whether to continue or not after changing repositories.

60a3ad1... by Jarno Suni on 2016-12-18

Make apt-get show version info on revert.

9e7bb54... by Jarno Suni on 2016-12-18

Add long opitions; new --version, --remove, --verbose, remove -dq

Use getopt to parse options. Add long options. Options may also be
after arguments.

Remove -d option, but user may set environment variable RELEASE to
override automaticly determined release name.

Remove -q, but new -v alias --verbose is used to control the same
thing.

New options:
--remove, -r: Remove repository entries or list files. LP: #945473
--verbose, -v: Control output of "apt-get update". LP: #1293507
--version, -V: Print standard GNU version information.

Manual page was generated by command
"help2man -N ./ppa-purge >debian/ppa-purge.1".

[Tim (darkxst)]

It is very easy

you need to use `git rebase -i HEAD~40` the last number is the amount of
commits to go back.

then you can group the commits you want to merge (cut and paste the line
and put it where it needs to go)

set the second commits action (first column) to s (squash)

It will then merge those commits, if there are any conflicts in the auto
merge it might leave little snippets in the code that you need to
manually correct. These will look something like

 >>>>>>>>>> HEAD

old code

========

new code

<<<<<<<<<< later commit

Fix those, then "git add <file>"

git rebase --continue

update the commit message for the merged commit and its done!

If you want to just remove commits (for example the commit that adds
check ubuntu dists, then the other that subsequently removes it)

use the same "git rebase -i" command and then just delete the lines for
any commits to remove.

you can also you the e (edit) action if you ever need to make any change
to a particular commit!

On 19/12/16 00:31, Jarno Suni wrote:
> Is there an easy way to cancel the removing of && so that there is no mention of it in git log disturbing your mind?
>
> Is it a problem that there are 2 commits that deal with escaping ppa string? If you want less commits I could just commit the final code as one commit. But you did not accept that either.
>
>
> Diff comments:
>
>> diff --git a/ppa-purge b/ppa-purge
>> index a0b5e42..f197c2c 100755
>> --- a/ppa-purge
>> +++ b/ppa-purge
>> @@ -23,116 +38,196 @@ warn() {
>> write_msg "Warning: $*" 1>&2
>> }
>>
>> +error() {
>> + write_msg "Error: $*" 1>&2
>> +}
>> +
>> +apt_update() {
>> + msg "Updating package lists. This might take a while..."
>> + $APT $quiet_arg update
>> + exit_status=$?
>> + [[ $exit_status -eq 0 ]] &&
>> + msg "Updating package lists finished successfully." || {
>> + local -r text="Updating package lists failed; error code $exit_status."
>> + if [[ $yes ]]; then
>> + error "$text"
>> + [[ $quit ]] || exit 5
>> + else
>> + warn "$text"
>> + [[ $quit ]] || {
>> + read -p "Continue anyway (y/n)? " -n 1 -r
> Yes, I could remove it, I suppose.
>
>> + echo
>> + [[ $REPLY =~ ^[Yy]$ ]] || exit 5
>> + }
>> + fi
>> + }
>> +}
>> +
>> +finish() {
>> + quit=t
>> + rm $PPA_PKGS $REVERTS
>> + if [[ $restore && ((${#lists[@]} > 0)) ]]; then
>> + msg 'Restoring .list file(s):'
>> + for file in "${lists[@]}"; do
>> + cp -va "$file".save "$file"
>> + done
>> + apt_update
>> + fi
>> +}
>> +
>> +trap finish 0
>> +
>> usage() {
>> - echo "Usage: sudo ppa-purge [options] <ppa:ppaowner>[/ppaname]"
>> - echo
>> - echo "ppa-purge will reset all packages from a PPA to the standard"
>> - echo "versions released for your distribution."
>> - echo
>> - echo "Options:"
>> - echo " -p [ppaname] PPA name to be disabled (default: ppa)"
>> - echo " -o [ppaowner] PPA owner"
>> - echo " -s [host] Repository server (default: ppa.launchpad.net)"
>> - echo " -d [distribution] Override the default distribution choice."
>> - echo " -y Pass "-y --force-yes" to apt-get or "-y" to aptitude"
>> - echo " -i Reverse preference of apt-get upon aptitude."
>> - echo " -h Display this help text"
>> -...

2db960c... by Jarno Suni on 2016-12-20

Be more strict when checking, if apt-get fails to update all repositories.

Regard even warnings in "apt-get update" as fatal errors.
Fixes LP: #1514839

4744e12... by Jarno Suni on 2016-12-21

Add option --figure-soname-bumps to optionally enable old default.

Disable the explicit figuring by default; let apt-get handle
installing soname bumped packages automatically. If the option
is used, do the figuring, and display the list of packages that are
going to be explicitly installed due to (figured) soname bump.

b51c9e1... by Jarno Suni on 2016-12-22

Instead of matching all components, match only distribution name.

If source distribution name is given, purge repository only, if
the distribution name matches.

The previous approach of matching all components is tricky: The
first component in deb line is actually source distribution name
and it should be treated differently. If there is a deb line
containing many components, specifying one in command line would
purge all of them (in the respective repository), so removing
only that component in the respective deb line should be done
instead of disabling the whold line. Removing components can be
done relatively easy by other tools, so it was dropped here to
keep it simple.

3e937ff... by Jarno Suni on 2016-12-23

Fine-tune bash completions

Do not always complete options, except when the word begins with -.
As for other words, complete only what could be used to avoid long
lists.

Do not use "command" with sed. If you were paranoid, you would use
it with compgen and complete, too, but it is not usually done.

[Jarno Suni (jarnos)]

I did the changes you suggested, but I was in another branch, and to my surprise, the changes do not show in master. BTW I also changed the first commit to include (all?) remarkable authors, but that again does not show in master.

[Jarno Suni (jarnos)]

I thought the changes would go to each branch since all of them were same up to those commits before changing.

[Tim (darkxst)]

you need to push a new branch after rebasing!

[Jarno Suni (jarnos)]

On Sat, 24 Dec 2016 04:38:45 -0000
Tim <email address hidden> wrote:

> you need to push a new branch after rebasing!

You mean the feature branch I created for enabling long options and
removing distributions? Where could I push that one or do you mean I
merge it to my local master and then push?

--
Jarno Ilari Suni - http://www.iki.fi/8/

[Tim (darkxst)]

any branch in general, when you rebase it destroys the history and needs to be re-pushed. you can force overwrite an existing branch but if
anyone is using that, they will have issues!

On 25/12/16 07:12, Jarno Suni wrote:
> On Sat, 24 Dec 2016 04:38:45 -0000
> Tim <email address hidden> wrote:
>
>> you need to push a new branch after rebasing!
> You mean the feature branch I created for enabling long options and
> removing distributions? Where could I push that one or do you mean I
> merge it to my local master and then push?
>

5f63cfe... by Jarno Suni on 2016-12-31

Improve regular expression matching, do not use [:space:]

Use [:blank:] instead.

abb9aa4... by Jarno Suni on 2016-12-31

Do not autocomplete PPAs as http://*

a14bb53... by Jarno Suni on 2016-12-31

Use temporary directory. Optimize creating REVERTS list for Precise.

Use temporaty directory for easy removing and creating of files.

fef559f... by Jarno Suni on 2017-01-03

Improve completing verbose option.

Besides do not be fooled to think that distribution argument is
given, if only an argument for verbose option is given as a separate
word.

89b15ea... by Jarno Suni on 2017-01-04

Update some debian files.

[Jarno Suni (jarnos)]

I have not succeeded in pushing the feature branch where the changes are made anywhere. I am afraid it is hard to merge to the master branch, but I could try.

[Jarno Suni (jarnos)]

Could I delete the current master, and make the feature branch new master somehow?

[Tim (darkxst)]

has it been rebased on master?

if so then that is fine.

On 21/02/17 22:55, Jarno Suni wrote:
> Could I delete the current master, and make the feature branch new master somehow?

[Jarno Suni (jarnos)]

I used this procedure to make the feature branch the new master: http://stackoverflow.com/a/2763118/4414935
Commits of the old master are shown in log, but they are not used if I understood correctly.

[Jarno Suni (jarnos)]

I wonder, if there are any issues, if I remove the commits of the old master?

[Jarno Suni (jarnos)]

This version may downgrade ppa-purge itself, but not purge it.

[Jarno Suni (jarnos)]

Hello,

How are you? Do you still miss a proper internet connection or what is
keeping you from reviewing the changes?

-Jarno

On Wed, 22 Feb 2017 07:15:44 -0000
Tim <email address hidden> wrote:

> has it been rebased on master?
>
> if so then that is fine.
>
>
>
> On 21/02/17 22:55, Jarno Suni wrote:
> > Could I delete the current master, and make the feature branch new
> > master somehow?
>
>

--
Jarno Ilari Suni - http://www.iki.fi/8/

[Tim (darkxst)]

Yes still without proper internet should have ADSL in a few weeks
so,will take a look then. Sorry about the delay

On Wed, Apr 26, 2017, at 07:06 AM, Jarno Suni wrote:
> Hello,
>
> How are you? Do you still miss a proper internet connection or what is
> keeping you from reviewing the changes?
>
> -Jarno
>
>
> On Wed, 22 Feb 2017 07:15:44 -0000
> Tim <email address hidden> wrote:
>
> > has it been rebased on master?
> >
> > if so then that is fine.
> >
> >
> >
> > On 21/02/17 22:55, Jarno Suni wrote:
> > > Could I delete the current master, and make the feature branch new
> > > master somehow?
> >
> >
>
>
>
> --
> Jarno Ilari Suni - http://www.iki.fi/8/
>
> https://code.launchpad.net/~jarnos/ppa-purge/+git/ppa-purge/+merge/313001
> Your team ppa-purge is requested to review the proposed merge of
> ~jarnos/ppa-purge:master into ppa-purge:master.

--
  Tim Lunn
  <email address hidden>

[Jarno Suni (jarnos)]

There seem to be some conflicts. Is it because you have added few commits in master after I made this merge proposal? My changes have parent commit 9dbd19d24294cd87bed43939a1a7366f5f2fcf4a in the target branch. I recently tried to simplify commit history by deleting some branches and force removing last merge commit push. My repository seems to be ok now.

4b42b42... by Jarno Suni on 2017-05-01

Ubuntu 12.04 is no more supported

[Jarno Suni (jarnos)]

I force pushed some small changes.

[Jarno Suni (jarnos)]

It may be unnecessary to check for warnings in apt_update(). See https://bugs.launchpad.net/ubuntu/+source/apt/+bug/1693900

cc0e6e1... by Jarno Suni on 2017-08-05

Give user an option to continue in case update from some irrelevant
source will fail.

[Jarno Suni (jarnos)]

My bash completion implementation is maybe too complicated as it shows '--verbose=0', '--verbose=1' and '--verbose=2' directly as completion of '--'. I could simplify that.

[Jarno Suni (jarnos)]

Tim, do you have ADSL now after more than 3 months? I do not see why ADSL connection is so critical to you and why it is so hard for you the get internet connection for this reviewing task. (I had ADSL in the past, but the over-head wire was taken away, and I have used 4G ever since.)

Unmerged commits

cc0e6e1... by Jarno Suni on 2017-08-05

Give user an option to continue in case update from some irrelevant
source will fail.

4b42b42... by Jarno Suni on 2017-05-01

Ubuntu 12.04 is no more supported

89b15ea... by Jarno Suni on 2017-01-04

Update some debian files.

fef559f... by Jarno Suni on 2017-01-03

Improve completing verbose option.

Besides do not be fooled to think that distribution argument is
given, if only an argument for verbose option is given as a separate
word.

a14bb53... by Jarno Suni on 2016-12-31

Use temporary directory. Optimize creating REVERTS list for Precise.

Use temporaty directory for easy removing and creating of files.

abb9aa4... by Jarno Suni on 2016-12-31

Do not autocomplete PPAs as http://*

5f63cfe... by Jarno Suni on 2016-12-31

Improve regular expression matching, do not use [:space:]

Use [:blank:] instead.

4744e12... by Jarno Suni on 2016-12-21

Add option --figure-soname-bumps to optionally enable old default.

Disable the explicit figuring by default; let apt-get handle
installing soname bumped packages automatically. If the option
is used, do the figuring, and display the list of packages that are
going to be explicitly installed due to (figured) soname bump.

3e937ff... by Jarno Suni on 2016-12-23

Fine-tune bash completions

Do not always complete options, except when the word begins with -.
As for other words, complete only what could be used to avoid long
lists.

Do not use "command" with sed. If you were paranoid, you would use
it with compgen and complete, too, but it is not usually done.

b51c9e1... by Jarno Suni on 2016-12-22

Instead of matching all components, match only distribution name.

If source distribution name is given, purge repository only, if
the distribution name matches.

The previous approach of matching all components is tricky: The
first component in deb line is actually source distribution name
and it should be treated differently. If there is a deb line
containing many components, specifying one in command line would
purge all of them (in the respective repository), so removing
only that component in the respective deb line should be done
instead of disabling the whold line. Removing components can be
done relatively easy by other tools, so it was dropped here to
keep it simple.

diff --git a/debian/control b/debian/control
index 9efef2a..3798563 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,7 @@ Vcs-Browser: https://git.launchpad.net/ppa-purge
 Package: ppa-purge
 Architecture: all
 Depends: ${misc:Depends}, dpkg (>= 1.16.1)
-Suggests: aptitude (>= 0.6.6-1ubuntu1.2)
-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 
- system to normal after testing a new version from a PPA.
+Description: This program disables a PPA or another APT repository from
+ Software Sources and reverts system back to the official Ubuntu packages.
+ You can use this to e.g. return your system to normal after testing a
+ new version from a PPA or to downgrade packages from e.g. proposed ones.
diff --git a/debian/copyright b/debian/copyright
index fc4a6a5..394a34b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,12 +7,14 @@ Files: *
 Copyright:
  2009, Robert Hooker <[e-mail]>
  2009, Tormod Volden <[e-mail]>
+ Jarno Ilari Suni <[e-mail]>
 License: GPL-3
 
 Files: debian/*
 Copyright:
  2009, Robert Hooker <[e-mail]>
  2010, Lorenzo De Liso <[e-mail]>
+ 2017, Jarno Ilari Suni <[e-mail]>
 License: GPL-3
 
 License: GPL-3
diff --git a/debian/ppa-purge.1 b/debian/ppa-purge.1
index cc86fbf..f55008f 100644
--- a/debian/ppa-purge.1
+++ b/debian/ppa-purge.1
@@ -1,33 +1,86 @@
-.TH ppa-purge 1 2010-08-23 "ppa-purge"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
+.TH PPA-PURGE "1" "May 2017" "ppa-purge APT Software Purger" "User Commands"
 .SH NAME
-ppa-purge \- disables a PPA and reverts to official packages
-
+ppa-purge \- manual page for ppa-purge APT Software Purger
 .SH SYNOPSIS
-.B ppa-purge [-h | [-d <distribution>] [-s <host>] [-p <ppaname>] <ppa:<ppaowner[/ppaname>]>]
-
+.B ppa-purge
+[\fI\,options\/\fR] \fI\,ppa:<ppaowner>\/\fR[\fI\,/<ppaname>\/\fR]
+.br
+.B ppa-purge
+[\fI\,options\/\fR] \fI\,<URL> \/\fR[\fI\,<distribution>\/\fR]
+.br
+.B ppa-purge
+[\fI\,options\/\fR] \fI\,<distribution>\/\fR
+.br
+.B ppa-purge
+\fI\,{ --help | --version }\/\fR
 .SH DESCRIPTION
-This script provides a bash shell script capable of automatically downgrading all packages in a given PPA back to the ubuntu versions.
-
-.PP
-You have to run it using root privileges because of the package manager.
-
+ppa\-purge will disable matching repository/repositories and revert packages to
+versions available for target release. If a package is not available from any
+remaining repositories, it will be removed, unless it is a package related to
+current kernel or it is the package of this command. If <ppaname> is not given,
+\&'ppa' is used as default. If a distribution (such as xenial\-proposed) is given,
+repository must match it to be purged. Bash completion is supported.
+.SS "Exit Status:"
+.IP
+0 on success; non\-zero integer on error
 .SH OPTIONS
-
 .TP
-.B -h
-Display usage help. 
+\fB\-\-figure\-soname\-bumps\fR
+Explicitly install packages that are figured as soname
+bumped version of a package to be removed. Display
+list of these packages.
 .TP
-
+\fB\-s\fR, \fB\-\-simulate\fR
+No action; do not downgrade or remove packages.
 .TP
-.B -p\fR \fIPPA name\fR
-Name of the PPA to be reset, the default value is ppa.
+\fB\-u\fR, \fB\-\-no\-initial\-update\fR
+Skip initial update of package lists. Use this, if you
+are sure the package lists are updated already.
 .TP
-
-.B -s\fR \fIPPA host\fR
-Address of the repository server, the default value is ppa.launchpad.net.
-
+\fB\-r\fR, \fB\-\-remove\fR
+Remove unneeded .list files or repository entries
+instead of leaving backups or commenting entries out,
+respectively.
+.TP
+\fB\-v\fR <level>, \fB\-v\fR<level>, \fB\-\-verbose\fR <level>, \fB\-\-verbose=\fR<level>
+Verbosity level of "apt\-get update" output.
+0: only errors
+1: output in one line aiming to give indication of
+progress. (default)
+2: output in separate lines.
+.TP
+\fB\-y\fR, \fB\-\-yes\fR
+Run non\-interactively; do not prompt for changes.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Display this help text and exit.
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Show version and exit.
+.SH ENVIRONMENT
+.TP
+RELEASE
+Target release to be downgraded to. If not set, output of
+"lsb_release \fB\-cs\fR" is used.
+.SH EXAMPLES
+.IP
+sudo ppa\-purge ppa:ubuntu\-x\-swat/x\-updates
+.IP
+Purge the same PPA on Linux Mint 18.1 (based on Ubuntu 16.04):
+.IP
+sudo RELEASE=16.04 ppa\-purge ppa:ubuntu\-x\-swat/x\-updates
+.IP
+Purge Google Chrome repository:
+.IP
+sudo ppa\-purge http://dl.google.com/linux/chrome/deb
+.IP
+Downgrade packages from xenial\-proposed in Ubuntu 16.04:
+.IP
+sudo ppa\-purge xenial\-proposed
 .SH COPYRIGHT
-This manual page is Copyright 2010 Lorenzo De Liso <[e-mail]>.
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU General Public License, Version 3 or any later
-version published by the Free Software Foundation.
+Copyright \(co  authors.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/debian/ppa-purge.bash-completion b/debian/ppa-purge.bash-completion
index be8edde..96811b7 100644
--- a/debian/ppa-purge.bash-completion
+++ b/debian/ppa-purge.bash-completion
@@ -1,80 +1,94 @@
 # /usr/share/bash-completion/completions/ppa-purge
 # Debian ppa-purge(1) completion -*- shell-script -*-
 
-_update_server(){
-    local i
-    for (( i=1; i < ${#words[@]}-1; i++)) ; do
-        case "${words[i]}" in
-            -s)
-                SERVER=${words[i+1]}
-                ;;
-            *)
-            ;;
-        esac
-    done
-}
+while true; do
 
-_update_owner(){
-    local i
-    for (( i=1; i < ${#words[@]}-1; i++)) ; do
-        case "${words[i]}" in
-            -o)
-                OWNER=${words[i+1]}
-                ;;
-            *)
-            ;;
-        esac
+# Hack for given strings $2,$3,... possibly being in $1 and $COMP_WORDBREAKS
+# Only the part after each match is listed as a completion.
+_ltrim_completions ()
+{
+	local cur=$1; shift
+	while [[ ${1+x} ]]; do
+		if [[ "$cur" == *$1* && "$COMP_WORDBREAKS" == *$1* ]]; then
+			local x_word=${cur%"${cur##*$1}"}
+			local i=${#COMPREPLY[*]}
+			while [[ $((--i)) -ge 0 ]]; do
+				COMPREPLY[$i]=${COMPREPLY[$i]#"$x_word"}
+			done
+		fi
+		shift
     done
-}
+} || break
 
-_ppa_names(){
-    _update_server
-    _update_owner
-    grep -hs "^deb\ .*$SERVER" /etc/apt/sources.list.d/*.list | grep "$OWNER" | command sed "s#.*$SERVER\/.*\/\(.*\)\/.*#\1#"
-}
+_ppa_purge_update_args(){
+	local i word last=$((${#words[@]}-1)) prevword=
+	for (( i=1; i < last; i++ )) ; do
+		word=${words[i]}
+		[[ $word != $cur ]] &&
+		case "$word" in
+			http://*) url=$word ;;
+			ppa:*) ppa=$word ;;
+			-*) ;;
+			?*) [[ $prevword =~ ^-([^-]*v|-verbose)$ ]] || dist=$word
+		esac
+		prevword=$word
+	done
+} || break
 
-_ppa_host(){
-    grep -hs "^deb\ .*tp\:\/\/.*\/.*\/.*" /etc/apt/sources.list.d/*.list | command sed "s#^deb.*\:\/\/\(.*\)\/.*\/.*/.*#\1#" | uniq
-}
+_repo_dist(){
+	[[ $url ]] &&
+	 sed -rn \
+'s#^[[:blank:]]*deb(-src)?([[:blank:]]+\[.+\])?[[:blank:]]+'"$url"'/?[[:blank:]]+([^[:blank:]]+).*#\3#p' \
+/etc/apt/sources.list.d/*.list /etc/apt/sources.list ||
+	 sed -rn \
+'s#^[[:blank:]]*deb(-src)?([[:blank:]]+\[.+\])?[[:blank:]]+http://[^[:blank:]]+[[:blank:]]+([^[:blank:]]+).*#\3#p' \
+/etc/apt/sources.list.d/*.list /etc/apt/sources.list
+} || break
 
-_ppa_owner(){
-    _update_server
-    grep -hs "^deb\ .*$SERVER" /etc/apt/sources.list.d/*.list | command sed "s#.*$SERVER\/\(.*\)\/.*\/.*#\1#"
-}
+_repo_list(){
+	[[ $dist ]] &&
+	 sed -rn \
+'s#^[[:blank:]]*deb(-src)?([[:blank:]]+\[.+\])?[[:blank:]]+(http://[^[:blank:]]+)[[:blank:]]+'"$dist"'[[:blank:]]+.*#\3#p' \
+/etc/apt/sources.list.d/*.list /etc/apt/sources.list | sed -e '/http:\/\/ppa\.launchpad\.net/d' -e 's#/$##' ||
+	 sed -rn \
+'s#^[[:blank:]]*deb(-src)?([[:blank:]]+\[.+\])?[[:blank:]]+(http://[^[:blank:]]+).*#\3#p' \
+/etc/apt/sources.list.d/*.list /etc/apt/sources.list | sed -e '/http:\/\/ppa\.launchpad\.net/d' -e 's#/$##'
+} || break
 
 _ppa_list(){
-    _update_server
-    _update_owner
-    grep -hs "^deb\ .*$SERVER" /etc/apt/sources.list.d/*.list | grep "$OWNER" | command sed "s#.*$SERVER\/\(.*\/.*\)\/.*#\1#" 
+	sed -rn \
+'s#^[[:blank:]]*deb(-src)?([[:blank:]]+\[.+\])?[[:blank:]]+http://ppa\.launchpad\.net/([^/[:blank:]]+/[^/[:blank:]]+).*#\3#p' \
+/etc/apt/sources.list.d/*.list /etc/apt/sources.list |
+	sed -e 's#^[^/]*$#&/#' -e 's#.*#ppa:&#'
+} || break
 
-}
 _ppa_purge(){
-    OWNER=""
-    SERVER="ppa.launchpad.net"
-    local cur prev words cword opts
-    _init_completion || return
-
-    opts="-p -s -o -d -y -i -h"
+	local cur prev words cword opts url= ppa= dist= wordlist
+	# Do not treat : and = as word breaks even if they are in $COMP_WORDBREAKS:
+	_init_completion -n : -n = || return
 
-    case "${prev}" in
-        -p)
-            COMPREPLY=( $( compgen -W "$(_ppa_names)" -- $cur ) )
-            return 0
-            ;;
-        -s)
-            COMPREPLY=( $( compgen -W "$(_ppa_host)" -- $cur ) )
-            return 0
-            ;;
-        -o)
-            COMPREPLY=( $( compgen -W "$(_ppa_owner)" -- $cur ) )
-            return 0
-            ;;
-        *)
-        ;;
-    esac
-    
-    COMPREPLY=( $( compgen -W '${opts} $(_ppa_list)' -- "$cur" ) )
+	opts=" --help --simulate --no-initial-update --yes --version --remove \
+--verbose=0 --verbose=1 --verbose=2 --figure-soname-bumps"
+#  short options are redundant and not that informative
+	opts+=' -h -s -u -y -r -v0 -v1 -v2 -V'
 
-   return 0
-} &&
-complete -F _ppa_purge ppa-purge
+	[[ $prev =~ ^-([^-]*v|-verbose)$ ]] && wordlist='0 1 2' || {
+		[[ $cur = -* ]] && wordlist=$opts || {
+			_ppa_purge_update_args
+			if [[ $ppa ]]; then
+				wordlist='$opts'
+			elif [[ $url ]]; then
+				[[ $dist ]] && wordlist='$opts' || wordlist='$(_repo_dist)'
+			elif [[ $dist ]]; then
+				wordlist='$(_repo_list)'
+			else
+				wordlist='$(_ppa_list) $(_repo_list) $(_repo_dist)'
+			fi
+		}
+	}
+	COMPREPLY=( $( compgen -W "$wordlist" -- "$cur" ) )
+	_ltrim_completions "$cur" : =
+	return 0
+} && complete -F _ppa_purge ppa-purge
+break
+done
diff --git a/ppa-purge b/ppa-purge
index 19ad281..cceb7fc 100755
--- a/ppa-purge
+++ b/ppa-purge
@@ -1,28 +1,100 @@
-#!/bin/bash
-# A script to remove all packages in a PPA and revert back to the normal
-# distribution ones.
+#!/bin/bash -u
+# A script to disable a repository and to remove all packages installed in your
+# system from it and to revert back to the version (if any) available from a
+# leftover repository.
 #
+<<<<<<< ppa-purge
 # AUTHORS: Robert Hooker (Sarvatt), Tormod Volden, Darkxst, Jarno Suni (jarnos)
+=======
+# AUTHORS: Robert Hooker (Sarvatt), Lorenzo De Liso, Tormod Volden,
+# Lorenzo De Liso, Tim Lunn (Darkxst), Jarno Ilari Suni (jarnos)
+
+export LC_ALL=C # Use C locale to get standard sorting and better regex
+# performance.
+export TMPDIR=/dev/shm # dir for mktemp to create files in
+
+# Constants
+declare -r APT=apt-get \
+yes_option='--force-yes' \
+F_ARCHS=$(dpkg --print-foreign-architectures) \
+mytmpdir=$(mktemp -d)
+declare -r PKGS=${mytmpdir}pkgs \
+REVERTS=${mytmpdir}reverts \
+EXITCODE=${mytmpdir}exitcode \
+program_name=ppa-purge \
+program_full_name='ppa-purge APT Software Purger' \
+program_pkg_name=ppa-purge \
+program_version= \
+copyright='authors' \
+copyright_year=
+
+# Initialize some variables
+restore=t
+declare -a lists=()
+url=
+no_update=
+>>>>>>> ppa-purge
 
 # Defaults
-F_ARCHS=$(dpkg --print-foreign-architectures)
-PPA_PKGS=$(mktemp)
-REVERTS=$(mktemp)
-trap "rm $PPA_PKGS $REVERTS" 0
+# Default for RELEASE will be set below, if needed.
+yes=
+simulate=
+skip_initial_update=
+remove=
+verbose=1
+figure_soname=
 
 # Functions to write output nicely.
-write_msg() {
-    echo "$*" | fold -s -w "${COLUMNS:-80}"
-}
-
 msg() {
-	write_msg "$*"
+	echo "[$program_name] $*"
 }
 
 warn() {
-	write_msg "Warning:  $*" 1>&2
+	msg "Warning:  $*" 1>&2
+}
+
+error() {
+	msg "Error:  $1" 1>&2
+	exit ${2:-1}
 }
 
+apt_update() {
+	msg "Updating package lists..."
+	local cols=0
+	while read -r; do
+		case $verbose in
+			1)	cols=$(tput cols)
+				printf '\r%-*s' $cols "${REPLY:0:$cols}" ;;
+			2)	printf '%s\n' "$REPLY"
+		esac
+	done < <(
+		exec 3>&1
+		set -o pipefail
+		$APT update 2>&1 >&3 | {
+			# read and echo warning & error messages
+			w=
+			while read -r; do
+				printf '%s\n' "$REPLY" >&2
+				[[ $REPLY =~ ^W: ]] && w=t # warning detected
+			done
+			[[ $w ]] && printf 0 >$EXITCODE || :
+		} || printf $? >$EXITCODE
+		set +o pipefail
+	)
+	[[ $verbose -eq 1 && $cols -gt 0 ]] && printf '%-*s\r' $cols "" # clear line
+	# exit with error, if $APT gave warning or error.
+	[[ -s $EXITCODE ]] && {
+		no_update=t
+		local exit_code=$(<$EXITCODE)
+		[[ $yes || $exit_code -ne 0 ]] || {
+		 read -r -p "$(msg 'Continue even if warning was detected (Y/n)? ')"
+		 [[ ! ( -z $REPLY || $REPLY =~ ^[Yy]$ ) ]]
+		} && error "Updating package lists failed; error code ${exit_code}." 5
+	}
+	return 0
+}
+
+<<<<<<< ppa-purge
 error() {
 	write_msg "Error:  $*" 1>&2
 }
@@ -59,11 +131,115 @@ usage() {
 	echo "(For example: you left synaptic open while attempting to run it) simply"
 	echo "uncomment the PPA from your sources, run apt-get update and try again."
 	echo
+=======
+finish() {
+	set +o pipefail
+	((${#lists[@]} > 0)) && {
+
+		[[ $restore ]] && {
+			msg 'Restoring .list file(s):'
+			for file in "${lists[@]}"; do
+			 mv -fv "$file".save "$file"
+			done
+			[[ $no_update ]] || apt_update
+		} || {
+			[[ $remove ]] && {
+				msg 'Removing .list file(s):'
+				for file in "${lists[@]}"; do
+					grep -Evq '^[[:blank:]]*(#.*)?$' "$file" || {
+						# everything is commented out
+						rm -rv "$file" "$file".save* || :
+					}
+				done
+			}
+		}
+	}
+	rm -rf $mytmpdir
+}
+
+trap finish 0
+
+usage() {
+fold -s -w "${COLUMNS:-80}" << EOF
+Usage: $program_name [options] ppa:<ppaowner>[/<ppaname>]
+or: $program_name [options] <URL> [<distribution>]
+or: $program_name [options] <distribution>
+or: $program_name { --help | --version }
+
+$program_name will disable matching repository/repositories and revert \
+packages to versions available for target release. If a \
+package is not available from any remaining repositories, it will be removed, \
+unless it is a package related to current kernel or it is the package of this \
+command. If <ppaname> is not given, 'ppa' is used as default. If a \
+distribution (such as xenial-proposed) is given, repository must match it to \
+be purged. Bash completion is supported.
+
+Exit Status:
+ 0 on success; non-zero integer on error
+
+Options:
+ --figure-soname-bumps    Explicitly install packages that are figured as soname
+                          bumped version of a package to be removed. Display
+                          list of these packages.
+ -s, --simulate           No action; do not downgrade or remove packages.
+ -u, --no-initial-update  Skip initial update of package lists. Use this, if you
+                          are sure the package lists are updated already.
+ -r, --remove             Remove unneeded .list files or repository entries
+                          instead of leaving backups or commenting entries out,
+                          respectively.
+ -v <level>, -v<level>, --verbose <level>, --verbose=<level>
+                          Verbosity level of "$APT update" output.
+                          0: only errors
+                          1: output in one line aiming to give indication of
+                          progress. (default)
+                          2: output in separate lines.
+ -y, --yes                Run non-interactively; do not prompt for changes.
+ -h, --help               Display this help text and exit.
+ -V, --version            Show version and exit.
+
+Environment:
+ RELEASE    Target release to be downgraded to. If not set, output of
+            "lsb_release -cs" is used.
+
+Examples:
+ sudo $program_name ppa:ubuntu-x-swat/x-updates
+
+ Purge the same PPA on Linux Mint 18.1 (based on Ubuntu 16.04):
+
+ sudo RELEASE=16.04 $program_name ppa:ubuntu-x-swat/x-updates
+
+ Purge Google Chrome repository:
+
+ sudo $program_name http://dl.google.com/linux/chrome/deb
+
+ Downgrade packages from xenial-proposed in Ubuntu 16.04:
+
+ sudo $program_name xenial-proposed
+
+EOF
+>>>>>>> ppa-purge
 	exit $1
 }
 
+show_version() {
+printf "$program_full_name $program_version
+Copyright (C) $copyright_year $copyright.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.\n"
+}
+
+suggest_usage() {
+	echo "Run '$program_name -h' to get help."
+}
+
+# escape special characters (http://unix.stackexchange.com/a/209744/111181)
+escape_regex() {
+	printf '%s' "$1" | sed 's/[.[\*^$()+?{|]/\\&/g'
+}
 
 # Command line options
+<<<<<<< ppa-purge
 while getopts ":p:o:s:d:yih" opt; do
 	case "$opt" in
 		p ) PPANAME="$OPTARG"				;;
@@ -75,8 +251,47 @@ while getopts ":p:o:s:d:yih" opt; do
 		h ) usage 0;						;;
 		\? ) error "Unknown option -$OPTARG'"; usage 1;	;;
 		:)  error "Missing arguments -$OPTARG"; usage 1		;;
+=======
+env -u GETOPT_COMPATIBLE getopt --test >/dev/null || [[ $? -ne 4 ]] && {
+	# This should not happen with util-linux's getopt.
+	error '`getopt --test` failed in this environment.' 3
+}
+
+# Option name followed by ':' denotes an option that has an argument.
+# Options are separated by ','.
+params=$(env -u GETOPT_COMPATIBLE getopt -o suyhrv:V \
+-l simulate,no-initial-update,yes,help,version,remove,verbose:,\
+figure-soname-bumps --name "[$program_name] Error" -- "$@") || {
+	# If $? = 1, command line is invalid; getopt displays an error message
+	[[ $? -eq 1 ]] && exit 1
+	>&2 error 'getopt failed.' 3
+}
+# $params contains at least --
+
+eval set -- "$params"
+unset -v params
+while :; do
+	case $1 in
+		-s|--simulate ) simulate='-s' ;;
+		-u|--no-initial-update ) skip_initial_update=t ;;
+		-y|--yes ) yes="$yes_option" ;;
+		-V|--version ) show_version; exit ;;
+		-h|--help ) usage 0 ;;
+		-r|--remove ) remove=t ;;
+		-v|--verbose )
+			case $2 in
+			 0|1|2) verbose="$2" ;;
+			 *) error "Invalid verbose level." 1 ;;
+			esac
+			shift 2; continue ;;
+		--figure-soname-bumps ) figure_soname=t ;;
+		-- ) # End of all options.
+			shift; break
+>>>>>>> ppa-purge
 	esac
+	shift
 done
+<<<<<<< ppa-purge
 shift $(($OPTIND -1))
 
 if [[ $1 ]]; then
@@ -93,31 +308,41 @@ if [[ $1 ]]; then
 		usage 1
 	fi
 fi
+=======
+>>>>>>> ppa-purge
 
-APTARG=""
-if [ ! -z "$APTALT" ]; then
-	if [ ! -z "$FORCEINSTALL" ]; then
-	APTARG="-y"
-	fi
-	APT=aptitude; APTALT=apt-get
-else
-	if [ ! -z "$FORCEINSTALL" ]; then
-	APTARG="-y --force-yes"
+distro=
+while [[ ${1-} ]]; do
+	if [[ $1 =~ ^ppa:([^/[:blank:]]+)(/[^/[:blank:]]+)?$ ]]; then
+		url=ppa.launchpad.net/${BASH_REMATCH[1]}${BASH_REMATCH[2]:-/ppa}/ubuntu
+	elif [[ $1  =~ ^http://([^[:blank:]]*[^/[:blank:]])/?$ ]]; then
+		url=${BASH_REMATCH[1]}
+	else
+		distro=$1
 	fi
-	APT=apt-get; APTALT=aptitude
-fi
+	shift
+done
 
+<<<<<<< ppa-purge
 if [ -z "$PPAOWNER" ]; then
 	error "Required ppa-name argument was not specified"
 	usage 1
-fi
+=======
+[[ -z $url && -z $distro ]] && {
+	error "No argument given. $(suggest_usage)"
+}
 
-# If not set, using defaults
-[ -z "$PPAHOST" ] && PPAHOST="ppa.launchpad.net"
-[ -z "$PPANAME" ] && PPANAME="ppa"
-[ -z "$DIST" ] && DIST=$(lsb_release -c -s)
+if [[ ${RELEASE+x} ]]; then
+	[[ $RELEASE =~ ^[^/[:blank:]]+$ ]] || {
+		error "Invalid target release name :" \'"$RELEASE"\'
+	}
+else
+	RELEASE=$(lsb_release -c -s)
+>>>>>>> ppa-purge
+fi
 
 if [ "$(id -u)" != "0" ]; then
+<<<<<<< ppa-purge
 	error "This script would need superuser privileges, use sudo"
 	usage 1
 fi
@@ -127,17 +352,32 @@ if ! $APT update > /dev/null; then
     error "$APT update failed for some reason"
     exit 1
 fi
+=======
+	error "This script would need superuser privileges, use sudo" 2
+fi
 
-msg "PPA to be removed: $PPAOWNER $PPANAME"
+[[ $skip_initial_update ]] || apt_update
+no_update=t
+>>>>>>> ppa-purge
 
-# Make list of all packages in PPA
-PPA_LIST=/var/lib/apt/lists/${PPAHOST}_${PPAOWNER}_${PPANAME}_*_Packages
-for LIST in $PPA_LIST; do
-	if [ -e $LIST ]; then
-		grep "^Package: " $LIST | cut -d " " -f2 | sort >> $PPA_PKGS
+msg "To be removed: ${url} ${distro}"
+
+# Make list of all packages available from the matching archive(s)
+[[ $url ]] && _url=$(tr / _ <<<"$url") || _url='*'
+for LIST in /var/lib/apt/lists/${_url}_dists_*_Packages; do
+	if [ -f $LIST ]; then
+		nomatch=
+		if [[ $distro ]]; then
+			dist=${LIST##*_dists_}
+			dist=${dist%%_*}
+			[[ $dist == $distro ]] || nomatch=t
+		fi
+		[[ $nomatch ]] ||
+		 grep "^Package: " $LIST | cut -d " " -f2 >> $PKGS
 	fi
 done
 
+<<<<<<< ppa-purge
 if [ ! -s $PPA_PKGS ]; then
 	error "Could not find package list for PPA: $PPAOWNER $PPANAME"
 	exit 1
@@ -147,70 +387,148 @@ fi
 if grep -q "ppa-purge" $PPA_PKGS; then
 	sed -i '/ppa-purge/d' $PPA_PKGS
 	msg "Note: Not removing ppa-purge package"
+=======
+if [ ! -s $PKGS ]; then
+	error "Could not find matching packages." 4
+>>>>>>> ppa-purge
 fi
 
 # 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
+sort -u $PKGS | xargs dpkg-query -W \
+ -f='${binary:Package}\t${db:Status-Abbrev}\n' 2>/dev/null |
+  awk '/\tii $/{print $1}' > $REVERTS
+>$PKGS
 
-# 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
+# Disable matching lines from sources.list files
+[[ $url ]] &&
+ regex='^[[:blank:]]*deb(-src)?([[:blank:]]+\[.+\])?[[:blank:]]+http://'"$(escape_regex "$url")"'/?[[:blank:]]+([^[:blank:]]+)' ||
+ regex='^[[:blank:]]*deb(-src)?([[:blank:]]+\[.+\])?[[:blank:]]+http://[^[:blank:]]+ +([^[:blank:]]+)'
+newlist=
+for LIST in $(find /etc/apt/ -name "*.list" -exec readlink -e '{}' \;); do
+	changed=
+	while read -r; do
+	 nomatch=
+	 [[ "$REPLY" =~ $regex ]] && {
+		 if [[ $distro ]]; then
+			[[ ${BASH_REMATCH[3]} == $distro ]] || nomatch=t;
+		 fi
+	 } || nomatch=t
+
+	 [[ $nomatch ]] && newlist+="$REPLY"$'\n' || {
+		[[ $remove ]] && msg "Remove entry: $REPLY" || {
+			 newlist+="# $REPLY"$'\n'
+			 msg "Disable entry: $REPLY"
+		}
+		changed=t
+	 }
+	done <$LIST
+
+	[[ $changed ]] && {
+		msg "Making backup of .list file:"
+		mv -fvb "$LIST" "$LIST".save
+		lists+=("$LIST")
+		printf %s "$newlist" > "$LIST"
+	}
+	newlist=
 done
 
-msg "Updating packages lists"
-$APT update > /dev/null || warn "$APT update failed for some reason"
+[[ $yes ]] || {
+	read -p "$(msg 'Continue with these changes (Y/n)? ')" -r
+	[[ -z $REPLY || $REPLY =~ ^[Yy]$ ]] || exit
+}
+
+no_update=
+apt_update
+
+msg "Generating revert list..."
 
-# Create apt argument list for reverting packages, most of the foo here is to attempt
-# to unroll soname bumps
+# Create apt argument list for reverting packages
 
-REINSTALL=""
+# store available packages in a sorted variable for faster access.
+avail_pkgs=$(apt-cache dumpavail | grep '^Package:' | cut -d' ' -f2 | sort -urV)
+
+# Create an associated array for fast checking of available packages.
+# Creating takes some time though, say 1s, but will save a lot if there are many
+# reverts.
+declare -A avail=()
+for PKG in $avail_pkgs; do avail[$PKG]=; done
+
+# tag for current kernel version
+curkerversion=$(escape_regex $(uname -r | cut -d- -f1,2))
+# tag for current kernel flavor
+curkerflavor=$(escape_regex $(uname -r | cut -d- -f3-))
+REINSTALL=
+declare -a sonamepkg=()
 for PACKAGE in $(cat $REVERTS); do
-	PKG=$(echo $PACKAGE | cut -d ':' -f1)
-	[[ $PACKAGE == *:* ]] && D_ARCH=":"$(echo $PACKAGE | cut -d ':' -f2)
+	PKG=${PACKAGE%:*}
 
-	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)
+	# Test if PKG is still available
+#	if ! grep -xFq "$PKG" <<<"$avail_pkgs"; then
+	if [[ -z ${avail[$PKG]+x} ]]; then
 
-		APTAVAIL=$(grep-aptavail -eP  --pattern='^'$PAT'$' -s Package -n | sort -uV | sed -e '$!d')
+		# Explicitly remove the package that does not exist in archive unless
+		# it is versioned kernel package matching the current kernel or the
+		# package of this program.
+		[[ $PKG =~ ^linux-.+-${curkerversion}(-${curkerflavor})?$ ||
+		$PKG == $program_pkg_name ]] &&
+		msg "Note: Not removing $PKG package." ||
+		{
+			REINSTALL+=" $PACKAGE-"
 
-		#explicitly remove packages that don't exist in archive
-		if [ "x$APTAVAIL" != "x$PKG" ]; then
-			REINSTALL="$REINSTALL $PACKAGE-"
-		fi
+			[[ $figure_soname && $PKG != linux-* ]] && {
+				# Maybe could even restrict to lib* ?
+				# check if the package is availabe with another version tag
+				pkg_regex=$(escape_regex "$PKG")
+				soname_regex=$(sed -r \
+				-e 's/[[:digit:]][[:lower:]]$/[[:digit:]][[:lower:]]/' \
+				-e 's/[[:digit:]]+/[[:digit:]]+/g' <<<"$pkg_regex")
+				[[ $soname_regex != $pkg_regex ]] && {
 
-		#downgrade packages that have a soname bump
-		if [ -n "$APTAVAIL" ]; then
-			REINSTALL="$REINSTALL $APTAVAIL$D_ARCH/$DIST"
-		fi
+					# get the greatest available version of the package
+					APTAVAIL=$(grep -m 1 -E "^${soname_regex}$" \
+					<<<"$avail_pkgs" || :)
+
+					# downgrade packages that have a soname bump
+					[[ $APTAVAIL ]] && {
+						newpkg=${APTAVAIL}${PACKAGE#$PKG}
+						sonamepkg+=("$newpkg")
+						REINSTALL+=" $newpkg/$RELEASE"
+					}
+				}
+			}
+		}
 	else
-		REINSTALL="$REINSTALL $PACKAGE/$DIST"
+		REINSTALL+=" $PACKAGE/$RELEASE"
 	fi
 done
+unset -v avail avail_pkgs
+>$REVERTS
+
+[[ ${#sonamepkg[*]} -gt 0 ]] && {
+	msg "Going to install these packages due to soname bump figuring:
+$(printf '%s\n' "${sonamepkg[@]}")"
+	msg "These of them are installed already (but maybe different version):
+$(dpkg-query -W -f='${db:Status-Abbrev} ${binary:Package}\n' "${sonamepkg[@]}" \
+2>/dev/null | awk '/^.i /{print $2}')"
 
-msg "Package revert list generated:"
-msg "$REINSTALL"
-echo
+	[[ $yes ]] || {
+		read -p "$(msg 'Continue (Y/n)? ')" -r
+		[[ -z $REPLY || $REPLY =~ ^[Yy]$ ]] || exit
+	}
+}
 
-# FIXME:
-# Workaround for now in case APT fails. APTALT is a little more foregiving if the
-# revert list isn't 100% correct.
+msg "Reverting..."
+$APT $simulate $yes -V install $REINSTALL || {
+	exit_status=$?
+	[[ $exit_status -eq 1 ]] &&
+	# User aborted apt-get; no packages were downgraded or removed.
+	 exit 5 ||
+	 error "Something went wrong with $APT; error code $exit_status. \
+Packages may not have been reverted." 5
+}
+msg "Reverting packages finished successfully."
 
+<<<<<<< ppa-purge
 if $APT $APTARG install $REINSTALL; then
 	msg "PPA purged successfully"
 elif $APTALT $APTARG install $REINSTALL; then
@@ -219,4 +537,10 @@ else
 	error "Something went wrong, packages may not have been reverted"
 	exit 1
 fi
+=======
+[[ $simulate ]] &&
+ msg "Restoring repository entries, because this was just simulation:" ||
+ restore=
+# successful operation; no need to restore, unless in simulation mode.
+>>>>>>> ppa-purge
 exit 0