Merge into master : master : lp:~jarnos/ppa-purge : Git : Code : ppa-purge

Reviewer	Review Type	Date Requested	Status
ppa-purge		2016-12-12	Pending
Review via email: mp+313001@code.launchpad.net

~jarnos/ppa-purge:master updated on 2016-12-15

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.

Revision history for this message

Tim Lunn (darkxst) wrote on 2016-12-18:

#

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.

Reply

Revision history for this message

Tim Lunn (darkxst) wrote on 2016-12-18:

#

s/subsequent/previous/ commits

Reply

Revision history for this message

Jarno Suni (jarnos) wrote on 2016-12-18:

#

Unfortunately development was not completely straight-forward.

Reply

Revision history for this message

Tim Lunn (darkxst) wrote on 2016-12-18:

#

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

Reply

Revision history for this message

Jarno Suni (jarnos) wrote on 2016-12-18:

#

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.

Reply

~jarnos/ppa-purge:master updated on 2016-12-18

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".

Revision history for this message

Tim Lunn (darkxst) wrote on 2016-12-19:

#

Download full text (9.9 KiB)

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"
>> -...

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"
>> -	echo
>> -	echo "Example usage commands:"
>> -	echo "	sudo ppa-purge -o xorg-edgers"
>> -	echo "	will remove https://launchpad.net/~xorg-edgers/+archive/ppa"
>> -	echo
>> -	echo "	sudo ppa-purge -o sarvatt -p xorg-testing"
>> -	echo "	will remove https://launchpad.net/~sarvatt/+archive/xorg-testing"
>> -	echo
>> -	echo "	sudo ppa-purge [ppa:]ubuntu-x-swat/x-updates"
>> -	echo "	will remove https://launchpad.net/~ubuntu-x-swat/+archive/x-updates"
>> -	echo
>> -	echo "Notice: If ppa-purge fails for some reason and you wish to try again,"
>> -	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
>> +	cat << EOF
>> +Usage:
>> +sudo ppa-purge [options] [ppa:]<ppaowner>[/<ppaname>]
>> +sudo ppa-purge [options] -o <ppaowner> [-p <ppaname>]
>> +ppa-purge -h
>> +
>> +ppa-purge will disable matching repository/repositories and revert packages to
>> +versions available from remaining enabled repositories. If the packages are not
>> +available from any remaining repositories, they will be removed. Bash completion
>> +is supported to make it easy to pick a repository.
>> +
>> +Options:
>> +	-h			Display this help text
>> +	-n			No action, do not downgrade or remove packages.
>> +	-q			Lessen output of $APT update.
>> +	-u			Skip initial update of package lists.
>> +	-y 			Run non-interactively; do not prompt for changes.
>> +	-d <distribution>	Override the default distribution choice.
>> +	-s <host>		Repository server (default: ppa.launchpad.net)
>> +	-o <ppaowner>		PPA owner
>> +	-p <ppaname>		PPA name to be disabled (default: ppa)
>> +
>> +Exit Code:
>> +	0: success
>> +	1: syntax error
>> +	2: no superuser privileges, even if required
>> +	4: given PPA not found in the system
>> +	5: $APT error
>> +
>> +Example usage commands:
>> +	sudo ppa-purge -o xorg-edgers
>> +	will remove https://launchpad.net/~xorg-edgers/+archive/ppa
>> +
>> +	sudo ppa-purge -o sarvatt -p xorg-testing
>> +	will remove https://launchpad.net/~sarvatt/+archive/xorg-testing
>> +
>> +	sudo ppa-purge ppa:ubuntu-x-swat/x-updates
>> +	will remove https://launchpad.net/~ubuntu-x-swat/+archive/x-updates
>> +
>> +	sudo ppa-purge -s linux.dropbox.com ubuntu/
>> +	will remove http://linux.dropbox.com/ubuntu
>> +
>> +EOF
>>   	exit $1
>>   }
>>   
>> +suggest_usage() {
>> +	msg "Run 'ppa-purge -h' to get help."
>> +	exit $1
>> +}
>> +
>> +# escape special characters (http://unix.stackexchange.com/a/209744/111181)
>> +escape_regex() {
>> +	printf '%s' "$1" | sed 's/[.[\*^$()+?{|]/\\&/g'
>> +}
>>   
>>   # Command line options
>> -while getopts "p:o:s:d:yih\?" opt; do
>> +while getopts "p:o:s:d:nquyh" opt; do
>>   	case "$opt" in
>>   		p ) PPANAME="$OPTARG"				;;
>>   		o ) PPAOWNER="$OPTARG"				;;
>>   		s ) PPAHOST="$OPTARG"   			;;
>>   		d ) DIST="$OPTARG"					;;
>> -		y ) FORCEINSTALL="true"				;;
>> -		i ) APTALT="true"					;;
>> +		n ) simulate='-s'					;;
>> +		q ) quiet_arg='-q=2'				;;
>> +		u ) skip_initial_update=t			;;
> Sorry, but what? I have not had problems with the option. Lists are up-to-date after successful run of ppa-purge no matter if simulation or not, so it is not needed to run update in the beginning of new run.
>
>> +		y ) yes="$yes_option"				;;
>>   		h ) usage 0;						;;
>> -		\?) usage 1;						;;
>> -		* ) warn "Unknown option '$opt'"; usage 1;	;;
>> +		? ) error "Unknown option"; suggest_usage 1;;
>>   	esac
>>   done
>>   shift $(($OPTIND -1))
>>   
>> +if [[ ${1-} ]]; then
>> +	regex='^(ppa:)?([^/:[:space:]]+)(/[^/[:space:]]*)?$'
>> +	if [[ $1 =~ $regex ]]; then
>> +		PPAOWNER=$(sed -rn 's#'"$regex"'#\2#p' <<<"$1")
>> +		postfix=$(sed -rn 's#'"$regex"'#\3#p' <<<"$1")
>> +		if [[ $postfix ]]; then
>> +			PPANAME="${postfix:1}"
>> +		fi
>> +	else
>> +		error "Invalid argument:" \'"$1"\'
>> +		suggest_usage 1
>> +	fi
>> +fi
>> +
>>   if [ -z "$PPAOWNER" ]; then
>> -    PPAOWNER=$1
>> +	error "Required ppa-name argument was not specified"
>> +	suggest_usage 1
>>   fi
>>   
>> -APTARG=""
>> -if [ ! -z "$APTALT" ]; then
>> -	if [ ! -z "$FORCEINSTALL" ]; then
>> -	APTARG="-y"
>> -	fi
>> -	APT=aptitude; APTALT=apt-get
>> +[[ $PPAOWNER =~ ^[^/:[:space:]]+$ ]] || {
>> +	error "Invalid PPA owner name :" \'"$PPAOWNER"\'
>> +	exit 1
>> +}
>> +
>> +if [[ ${PPAHOST+x} ]]; then
>> +	PPAHOST=${PPAHOST,,} # convert to lowercase
>> +	[[ $PPAHOST =~ ^[a-z0-9.-]+$ ]] || {
>> +		error "Invalid PPA host name :" \'"$PPAHOST"\'
>> +		exit 1
>> +	}
>>   else
>> -	if [ ! -z "$FORCEINSTALL" ]; then
>> -	APTARG="-y --force-yes"
>> -	fi
>> -	APT=apt-get; APTALT=aptitude
>> +	PPAHOST="ppa.launchpad.net"
>>   fi
>>   
>> -if echo $1 | grep -q "^ppa:"; then
>> -	PPAOWNER=$(echo $1 | sed "s#^ppa:$.*$/$.*$$#\1#")
>> -	PPANAME=$(echo $1 | sed "s#^ppa:$.*$/$.*$$#\2#")
>> -else
>> -    if echo $1 | grep -q "^.*/.*$"; then
>> -        PPAOWNER=$(echo $1 | sed "s#^$.*$/$.*$$#\1#")
>> -    	PPANAME=$(echo $1 | sed "s#^$.*$/$.*$$#\2#")
>> -    fi
>> +if [[ ${PPANAME+x} ]]; then
>> +	[[ $PPANAME =~ ^[^/[:space:]]*$ ]] || {
>> +		error "Invalid PPA name :" \'"$PPANAME"\'
>> +		exit 1
>> +	}
>> +else
>> +	PPANAME="ppa"
>>   fi
>>   
>> -if [ -z "$PPAOWNER" ]; then
>> -	warn "Required ppa-name argument was not specified"
>> -	usage 1
>> +if [[ ${DIST+x} ]]; then
>> +	[[ $DIST =~ ^[^/[:space:]]+$ ]] || {
>> +		error "Invalid distribution name :" \'"$DIST"\'
>> +		exit 1
>> +	}
>> +else
>> +	DIST=$(lsb_release -c -s)
>>   fi
>>   
>> -# If not set, using defaults
>> -[ -z "$PPAHOST" ] && PPAHOST="ppa.launchpad.net"
>> -[ -z "$PPANAME" ] && PPANAME="ppa"
>> -[ -z "$DIST" ] && DIST=$(lsb_release -c -s)
>> -
>>   if [ "$(id -u)" != "0" ]; then
>> -	warn "This script would need superuser privileges, use sudo"
>> -	usage 1
>> +	error "This script would need superuser privileges, use sudo"
>> +	exit 2
>>   fi
>>   
>> -msg "Updating packages lists"
>> -if ! $APT update > /dev/null; then
>> -    warn "$APT update failed for some reason"
>> -    exit 1
>> -fi
>> +[[ $skip_initial_update ]] || apt_update
>>   
>> -msg "PPA to be removed: $PPAOWNER $PPANAME"
>> +[[ $PPANAME ]] &&
>> +ppa_id="$PPAHOST/$PPAOWNER/$PPANAME" ||
>> +ppa_id="$PPAHOST/$PPAOWNER"
>> +msg "Repository to be removed: $ppa_id"
>>   
>>   # Make list of all packages in PPA
>> -PPA_LIST=/var/lib/apt/lists/${PPAHOST}_${PPAOWNER}_${PPANAME}_*_Packages
>> -for LIST in $PPA_LIST; do
>> +
>> +id=$(tr / _ <<<"$ppa_id")
>> +for LIST in /var/lib/apt/lists/"$id"_dists_*_Packages \
>> +/var/lib/apt/lists/"$id"_*_dists_*_Packages; do
>>   	if [ -e $LIST ]; then
>>   		grep "^Package: " $LIST | cut -d " " -f2 | sort >> $PPA_PKGS
>>   	fi
>>   done
>>   
>>   if [ ! -s $PPA_PKGS ]; then
>> -	warn "Could not find package list for PPA: $PPAOWNER $PPANAME"
>> -	exit 1
>> +	error "Could not find package list for repository $ppa_id"
>> +	exit 4
>>   fi
>>   
>>   # Ignore the ppa-purge package
>

Reply

~jarnos/ppa-purge:master updated on 2016-12-23

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.

Revision history for this message

Jarno Suni (jarnos) wrote on 2016-12-23:

#

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.

Reply

Revision history for this message

Jarno Suni (jarnos) wrote on 2016-12-23:

#

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

Reply

Revision history for this message

Tim Lunn (darkxst) wrote on 2016-12-24:

#

you need to push a new branch after rebasing!

Reply

Revision history for this message

Jarno Suni (jarnos) wrote on 2016-12-24:

#

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/

Reply

Revision history for this message

Tim Lunn (darkxst) wrote on 2016-12-24:

#

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?
>

Reply

~jarnos/ppa-purge:master updated on 2017-01-04

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.

Revision history for this message

Jarno Suni (jarnos) wrote on 2017-02-21:

#

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.

Reply

Revision history for this message

Jarno Suni (jarnos) wrote on 2017-02-21:

#

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

Reply

Revision history for this message

Tim Lunn (darkxst) wrote on 2017-02-22:

#

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?

Reply

Revision history for this message

Jarno Suni (jarnos) wrote on 2017-03-07:

#

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.

Reply

Revision history for this message

Jarno Suni (jarnos) wrote on 2017-03-08:

#

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

Reply

Revision history for this message

Jarno Suni (jarnos) wrote on 2017-03-08:

#

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

Reply

Revision history for this message

Jarno Suni (jarnos) wrote on 2017-04-25:

#

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/

Reply

Revision history for this message

Tim Lunn (darkxst) wrote on 2017-04-27:

#

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>

Reply

Revision history for this message

Jarno Suni (jarnos) wrote on 2017-04-29:

#

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.

Reply

~jarnos/ppa-purge:master updated on 2017-05-01

4b42b42... by Jarno Suni on 2017-05-01: Ubuntu 12.04 is no more supported

Revision history for this message

Jarno Suni (jarnos) wrote on 2017-06-23:

#

I force pushed some small changes.

Reply

Revision history for this message

Jarno Suni (jarnos) wrote on 2017-06-24:

#

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

Reply

~jarnos/ppa-purge:master updated on 2017-08-05

cc0e6e1... by Jarno Suni on 2017-08-05: Give user an option to continue in case update from some irrelevant
source will fail.

Revision history for this message

Jarno Suni (jarnos) wrote on 2017-08-07:

#

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.

Reply

Revision history for this message

Jarno Suni (jarnos) wrote on 2017-08-07:

#

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.)

Reply

~jarnos/ppa-purge:master updated on 2019-11-24

332281e... by Jarno Suni on 2019-11-06

Improve bash completion; list --verbose= without arguments first

Use -s option with _init_completion() to ease handling --option=argument
syntax.

Rename private functions to have __ prefix.

Fix __ppa_purge_update_args to work better in some cases where cursor is in
the middle of command line.

Cut long lines to smaller ones.

Do not complete (redundant) short options.

Define options using arrays and associated arrays. Also wordlist is defined as
an array.

Use new function __make_opts_wordlist() to form wordlist of options. Arguments
for options are not listed at this stage. Only add space after completing
options that do not take arguments to be able to append the argument.
(IFS=$'\n' is needed to be able to have space after a word in completion.)

_ltrim_completions() not needed when the other modifications are done,
but given __ltrim_colon_completions() is used.

1c57b90... by Jarno Suni on 2019-11-07

Catch also errors in output of $APT update

..in case exit code might not be non-zero with some reported errors.

c541876... by Jarno Suni on 2019-11-07

Remove old middle verbose level

Besides, use process substitution instead of pipe in apt_update().

9cd87b2... by Jarno Suni on 2019-11-09

Support Hypertext Transfer Protocol Secure (HTTPS) for repositories.

fb75d53... by Jarno Suni on 2019-11-18

Name the files so that they are in the created directory

Finally the files are deleted in finish trap.

3728645... by Jarno Suni on 2019-11-18

Avoid subshell in reading a file. Use proper IFS.

78d7a9f... by Jarno Suni on 2019-11-18

realpath is preferred over readlink here

According to command
man 1 readlink

6668353... by Jarno Suni on 2019-11-18

Allow disabling/removing even if there are no matching packages.

Make reverting a separate function to make the script easier to read.

526e40b... by Jarno Suni on 2019-11-18

Complete finish even if apt_update fails on restore.

07396e3... by Jarno Suni on 2019-11-18

Do actions only, if a .list file was changed.

2af4440... by Jarno Suni on 2019-11-18

Remove option --no-initial-update (or -u) and make the behavior default.

Add option --initial-update (or -i), instead, to enable the old default.

fdd8c50... by Jarno Suni on 2019-11-18

Rename the bash completion file to ppa-purge.bash

That name can be used when installing the completion to a
recommended location.

ae83a36... by Jarno Suni on 2019-11-18

Use Bash parameter expansion instead of separate command.

13f35ec... by Jarno Suni on 2019-11-21

This is system administration command, so move the man page in section 8.

5c69632... by Jarno Suni on 2019-11-21

Update copyright file

d519615... by Jarno Suni on 2019-11-21

Update control file and compat file

539e9f4... by Jarno Suni on 2019-11-21

Update changelog

3743f7b... by Jarno Suni on 2019-11-21

dh_bash-completion helper script expects ppa-purge.bash-completion

25c532a... by Jarno Suni on 2019-11-22

Update version; properly move the manual page to section 8

To properly change the section of the manual page, and to provide
a meaningful description of the command in the NAME section, use
help2man with the following options:
-s 8 -N -n 'disable repository and remove/downgrade associated packages'

f4bc62b... by Jarno Suni on 2019-11-24

Only one distribution is allowed

Revision history for this message

Jarno Suni (jarnos) wrote on 2019-11-25:

#

I made PPA of my branch: https://launchpad.net/~jarnos/+archive/ubuntu/ppa-purge
I set version 0.5.0.0 for it as it has a lot of changes to 0.2.8+bzr63.

Reply

~jarnos/ppa-purge:master updated on 2023-02-27

4a21739... by Jarno Suni on 2023-02-27

Enable support for exact path

See man sources.list for more information. Note that this software still does
not support deb822 format for software sources, and it does not recognize
other URI types than http, https and ppa.

ppa-purge

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

Commit message

Description of the change

Unmerged commits

Preview Diff

Subscribers

 diff --git a/debian/changelog b/debian/changelog
 index 20dc4e4..bc3e9e8 100644
 --- a/debian/changelog
 +++ b/debian/changelog
@@ -1,9 +1,32 @@
--ppa-purge (0.2.8.1) UNRELEASED; urgency=medium
++ppa-purge (0.5.0.0) bionic; urgency=high
++  [ Tim Lunn ]
    * Merge soname code missing from last release
    * Switch to git and fix Vcs- tags
-- -- Tim Lunn <tim@feathertop.org>  Tue, 15 Mar 2016 11:18:05 +1100
++  [ Jarno Suni ]
++  * Fixes bug LP: #802853: ppa-purge should have "dryrun" option
++  * Fixes bug LP: #821655: Removing xorg-edgers install KDE?
++  * Fixes bug LP: #945473: [wishlist] add an option to remove PPA
++  * Fixes bug LP: #995113: revert changes to sources.list.d when ppa-purge
++    fails
++  * Fixes bug LP: #1121325: Packages might get downgraded to stable release
++    version ignoring active updates/security archives
++  * Fixes bug LP: #1293507: Add a verbose option to the ppa-purge command (-v)
++  * Fixes bug LP: #1408031: Requesting purge to abort fails.
++  * Fixes bug LP: #1514839: ppa-purge misbehaves if repository update fails
++  * Fixes bug LP: #1548881: ppa-purge fails to remove packages when ppa
++    repository includes a plus in the name
++  * Fixes bug LP: #1614160: Could not find package list
++  * Fixes bug LP: #1617814: ppa-purge failed due to aptitude not being
++    installed
++  * Fixes bug LP: #1668660: ppa-purge package should require aptitude
++    (Because of the fix it actually does not need aptitude)
++  * Command line syntax is changed somewhat
++  * Bash completion has been improved
++  * Several other changes, refer to git log
++
++ -- Jarno Suni <sunijarno@gmail.com>  Thu, 21 Nov 2019 18:24:17 +0200
  ppa-purge (0.2.8+bzr63) xenial; urgency=low
 diff --git a/debian/compat b/debian/compat
 index 7f8f011..ec63514 100644
 --- a/debian/compat
 +++ b/debian/compat
@@ -1 +1 @@
--7
++9
 diff --git a/debian/control b/debian/control
 index 9efef2a..a114bfc 100644
 --- a/debian/control
 +++ b/debian/control
@@ -1,18 +1,18 @@
  Source: ppa-purge
  Section: utils
  Priority: optional
--Maintainer: Lorenzo De Liso <blackz@ubuntu.com>
--Build-Depends: debhelper (>= 7.0.50~), bash-completion
--Standards-Version: 3.9.3
--Homepage: https://launchpad.net/ppa-purge
--Vcs-Git: git://git.launchpad.net/ppa-purge
--Vcs-Browser: https://git.launchpad.net/ppa-purge
++Maintainer: Jarno Suni <sunijarno@gmail.com>
++Build-Depends: debhelper (>= 9), bash-completion
++Standards-Version: 3.9.8
++Homepage: https://launchpad.net/~jarnos/+archive/ubuntu/ppa-purge
++Vcs-Git: git+ssh://jarnos@git.launchpad.net/~jarnos/ppa-purge
++Vcs-Browser: https://git.launchpad.net/~jarnos/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.
++Depends: ${misc:Depends}, dpkg (>= 1.18.4)
++Description: Disables a PPA or another APT repository and reverts pkgs.
++ Use ppa-purge to remove a software source from your system and
++ downgrade or remove the packages it provided. 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..69bb3bb 100644
 --- a/debian/copyright
 +++ b/debian/copyright
@@ -1,18 +1,16 @@
--Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
--Name: ppa-purge
--Maintainer: Robert Hooker <sarvatt@ubuntu.com>
--Source: https://launchpad.net/ppa-purge
++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Source: https://code.launchpad.net/~jarnos/ppa-purge/+git/ppa-purge
  Files: *
--Copyright:
-- 2009, Robert Hooker <sarvatt@ubuntu.com>
-- 2009, Tormod Volden <debian.tormod@gmail.com>
++Copyright: 2009, Robert Hooker <sarvatt@ubuntu.com>
++           2009, Tormod Volden <debian.tormod@gmail.com>
++           2019, Jarno Ilari Suni <8@iki.fi>
  License: GPL-3
  Files: debian/*
--Copyright:
-- 2009, Robert Hooker <sarvatt@ubuntu.com>
-- 2010, Lorenzo De Liso <blackz@ubuntu.com>
++Copyright: 2009, Robert Hooker <sarvatt@ubuntu.com>
++           2010, Lorenzo De Liso <blackz@ubuntu.com>
++           2019, Jarno Ilari Suni <8@iki.fi>
  License: GPL-3
  License: GPL-3
 diff --git a/debian/ppa-purge.1 b/debian/ppa-purge.1
 deleted file mode 100644
 index cc86fbf..0000000
 --- a/debian/ppa-purge.1
 +++ /dev/null
@@ -1,33 +0,0 @@
--.TH ppa-purge 1 2010-08-23 "ppa-purge"
--.SH NAME
--ppa-purge \- disables a PPA and reverts to official packages
--
--.SH SYNOPSIS
--.B ppa-purge [-h | [-d <distribution>] [-s <host>] [-p <ppaname>] <ppa:<ppaowner[/ppaname>]>]
--
--.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.
--
--.SH OPTIONS
--
--.TP
--.B -h
--Display usage help.
--.TP
--
--.TP
--.B -p\fR \fIPPA name\fR
--Name of the PPA to be reset, the default value is ppa.
--.TP
--
--.B -s\fR \fIPPA host\fR
--Address of the repository server, the default value is ppa.launchpad.net.
--
--.SH COPYRIGHT
--This manual page is Copyright 2010 Lorenzo De Liso <blackz@ubuntu.com>.
--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.
 diff --git a/debian/ppa-purge.8 b/debian/ppa-purge.8
 new file mode 100644
 index 0000000..b861b1d
 --- /dev/null
 +++ b/debian/ppa-purge.8
@@ -0,0 +1,98 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.13.
++.TH PPA-PURGE APT SOFTWARE PURGER "1" "February 2023" "ppa-purge APT Software Purger 0.5.0.0" "User Commands"
++.SH NAME
++ppa-purge APT Software Purger \- manual page for ppa-purge APT Software Purger 0.5.0.0
++.SH SYNOPSIS
++.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
++ppa\-purge will disable the matching sources and revert packages to versions
++available from the remaining sources. If a package is not available from any
++remaining sources, 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 is given, a source must match it to
++be disabled/removed. distribution can be a suite name like stable or a codename
++like focal or an exact path in which case it must end with a slash (/). Bash
++completion is supported.
++.SS "Exit Status:"
++.IP
++0 on success; non\-zero integer on error
++.SH OPTIONS
++.TP
++\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
++\fB\-i\fR, \fB\-\-initial\-update\fR
++Do initial update of package lists. Use this, if you
++are not sure the package lists are updated already.
++.TP
++\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 and warninings
++1: normal output (default).
++.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
++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.
++.SH "SEE ALSO"
++The full documentation for
++.B ppa-purge APT Software Purger
++is maintained as a Texinfo manual.  If the
++.B info
++and
++.B ppa-purge APT Software Purger
++programs are properly installed at your site, the command
++.IP
++.B info ppa-purge APT Software Purger
++.PP
++should give you access to the complete manual.
 diff --git a/debian/ppa-purge.bash-completion b/debian/ppa-purge.bash-completion
 index be8edde..c337fa4 100644
 --- a/debian/ppa-purge.bash-completion
 +++ b/debian/ppa-purge.bash-completion
@@ -1,80 +1,99 @@
  # /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
--    done
--}
++# Check which arguments have been given already. This is used for
++# deciding which completions will be offered.
++__ppa_purge_update_args() {
++	local i word last=${#words[@]} prevword=
++	for (( i=1; i < $last; i++ )) ; do
++		word=${words[i]}
++		(( $i != $cword )) || [[ -z $cur ]] &&
++		case "$word" in
++			http?(s)://*) url=$word ;;
++			ppa:*) ppa=$word ;;
++			-*) ;;
++			?*) [[ $prevword =~ ^-([^-]*v|-verbose)$ ]] || dist=$word
++		esac
++		prevword=$word
++	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#"
--}
++__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 | sort -u ||
++	 sed -rn \
++'s#^[[:blank:]]*deb(-src)?([[:blank:]]+\[.+\])?[[:blank:]]+https?://[^[:blank:]]+[[:blank:]]+([^[:blank:]]+).*#\3#p' \
++/etc/apt/sources.list.d/*.list /etc/apt/sources.list | sort -u
++} || break
--_ppa_host(){
--    grep -hs "^deb\ .*tp\:\/\/.*\/.*\/.*" /etc/apt/sources.list.d/*.list | command sed "s#^deb.*\:\/\/\(.*\)\/.*\/.*/.*#\1#" | uniq
--}
++__repo_list() {
++	[[ $dist ]] &&
++	 sed -rn \
++'s#^[[:blank:]]*deb(-src)?([[:blank:]]+\[.+\])?[[:blank:]]+(https?://[^[: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:]]+(https?://[^[:blank:]]+).*#\3#p' \
++/etc/apt/sources.list.d/*.list /etc/apt/sources.list \
++| sed -e '/http:\/\/ppa\.launchpad\.net/d' -e 's#/$##'
++} || break
--_ppa_owner(){
--    _update_server
--    grep -hs "^deb\ .*$SERVER" /etc/apt/sources.list.d/*.list | command sed "s#.*$SERVER\/\(.*\)\/.*\/.*#\1#"
++__ppa_list() {
++	sed -rn \
++'s#^[[:blank:]]*deb(-src)?([[:blank:]]+\[.+\])?[[:blank:]]+https?://ppa\.launchpad\.net/([^/[:blank:]]+/[^/[:blank:]]+).*#\3#p' \
++/etc/apt/sources.list.d/*.list /etc/apt/sources.list |
++	sed -e 's#^[^/]*$#&/#' -e 's#.*#ppa:&#'
++} || break
++
++__make_opts_wordlist() {
++	local i
++	for i in ${opts[*]}; do wordlist+=("--$i "); done
++	for i in ${!args[*]}; do wordlist+=("--$i="); done
++	compopt -o nospace
+ }
--_ppa_list(){
--    _update_server
--    _update_owner
--    grep -hs "^deb\ .*$SERVER" /etc/apt/sources.list.d/*.list | grep "$OWNER" | command sed "s#.*$SERVER\/\(.*\/.*\)\/.*#\1#"
++_ppa_purge() {
++	local IFS=$'\n' # needed for handling trailing space of some options and all arguments
++	local cur prev words cword split # set by _init_completion()
--}
--_ppa_purge(){
--    OWNER=""
--    SERVER="ppa.launchpad.net"
--    local cur prev words cword opts
--    _init_completion || return
++	# Do not treat : and = as word breaks even if they are in $COMP_WORDBREAKS:
++	# Split option=value into option in $prev and value in $cur
++	_init_completion -n : -s || return
++
++	local opts=(help simulate initial-update yes version remove figure-soname-bumps)
++	local -A args=([verbose]=$'0\n1')
--    opts="-p -s -o -d -y -i -h"
++	local i
++	for i in ${!args[*]}; do
++		if [[ $prev = --$i ]]; then
++			[[ "$COMP_WORDBREAKS" != *=* && $split == true ]] && prefix="--$i="
++			COMPREPLY=( $( compgen -P "$prefix" -W "${args[$i]}" -- "$cur" ) )
++			return 0
++		fi
++	done
--    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" ) )
++	local url= ppa= dist= prefix= wordlist=()
++	[[ $cur = -* ]] && __make_opts_wordlist || {
++		__ppa_purge_update_args
++		if [[ $ppa ]]; then
++			__make_opts_wordlist
++		elif [[ $url ]]; then
++			[[ $dist ]] && __make_opts_wordlist || wordlist=( $(__repo_dist) )
++		elif [[ $dist ]]; then
++			wordlist=( $(__repo_list) )
++		else
++			wordlist=( $(__ppa_list; __repo_list; __repo_dist) )
++		fi
++	}
--   return 0
--} &&
--complete -F _ppa_purge ppa-purge
++	COMPREPLY=( $( compgen -W "${wordlist[*]}" -- "$cur" ) )
++	__ltrim_colon_completions "$cur"
++	return 0
++} && complete -F _ppa_purge ppa-purge
++break
++done
 diff --git a/debian/ppa-purge.manpages b/debian/ppa-purge.manpages
 index 189ec3e..c31d87b 100644
 --- a/debian/ppa-purge.manpages
 +++ b/debian/ppa-purge.manpages
@@ -1 +1 @@
--debian/ppa-purge.1
++debian/ppa-purge.8
 diff --git a/ppa-purge b/ppa-purge
 index 19ad281..f717ac5 100755
 --- a/ppa-purge
 +++ b/ppa-purge
@@ -1,29 +1,61 @@
--#!/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=0.5.0.0 \
++copyright='authors' \
++copyright_year=
++
++# Initialize some variables
++restore=t
++declare -a lists=()
++url=
++no_update=
++unset -v IFS
++>>>>>>> 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=
++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() {
++<<<<<<< ppa-purge
  	write_msg "Error:  $*" 1>&2
+ }
@@ -59,10 +91,138 @@ 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
++=======
++	msg "Error:  $1" 1>&2
++	exit ${2:-1}
++}
++
++apt_update() {
++	msg "Updating package lists..."
++	case $verbose in
++		0)	exec 3>/dev/null ;;
++		1)	exec 3>&1
++	esac
++	local exit_code=
++	{
++		# read and echo warning & error messages
++		w=
++		while IFS= read -r; do
++			printf '%s\n' "$REPLY" >&2
++			[[ $REPLY =~ ^[EW]: ]] && exit_code=0 # warning or error detected
++		done
++	} < <($APT update 2>&1 >&3 || printf $? >$EXITCODE)
++	exec 3>&-
++
++	[[ -s $EXITCODE ]] && IFS= read -r exit_code <"$EXITCODE"
++
++	[[ $exit_code ]] && {
++		no_update=t
++		[[ $yes || $exit_code -ne 0 ]] || {
++		 read -r -p "$(msg 'Continue even if error or warning was detected (Y/n)? ')"
++		 [[ ! ( -z $REPLY || $REPLY =~ ^[Yy]$ ) ]]
++		} && error "Updating package lists failed; error code ${exit_code}." 5
++	}
++	return 0
++}
++
++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 the matching sources and revert \
++packages to versions available from the remaining sources. If a \
++package is not available from any remaining sources, 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 is given, a source must match it to be \
++disabled/removed. distribution can be a suite name like stable or a \
++codename like focal or an exact path in which case it must end with \
++a slash (/). 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.
++ -i, --initial-update     Do initial update of package lists. Use this, if you
++                          are not 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 and warninings
++                          1: normal output (default).
++ -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"
++}
++<<<<<<< ppa-purge
  # Command line options
  while getopts ":p:o:s:d:yih" opt; do
  	case "$opt" in
@@ -93,30 +253,34 @@ if [[ $1 ]]; then
  		usage 1
  	fi
  fi
++=======
++suggest_usage() {
++	echo "Run '$program_name -h' to get help."
++}
--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"
--	fi
--	APT=apt-get; APTALT=aptitude
--fi
++# escape special characters (http://unix.stackexchange.com/a/209744/111181)
++escape_regex() {
++	printf '%s' "$1" | sed 's/[.[\*^$()+?{|]/\\&/g'
++}
++>>>>>>> ppa-purge
++
++<<<<<<< ppa-purge
  if [ -z "$PPAOWNER" ]; then
  	error "Required ppa-name argument was not specified"
  	usage 1
  fi
++=======
++revert() {
++	msg "Generating revert list..."
++
++	# Create apt argument list for reverting packages
++>>>>>>> ppa-purge
--# If not set, using defaults
--[ -z "$PPAHOST" ] && PPAHOST="ppa.launchpad.net"
--[ -z "$PPANAME" ] && PPANAME="ppa"
--[ -z "$DIST" ] && DIST=$(lsb_release -c -s)
++	# store available packages in a sorted variable for faster access.
++	avail_pkgs=$(apt-cache dumpavail | grep '^Package:' | cut -d' ' -f2 | sort -urV)
++<<<<<<< ppa-purge
  if [ "$(id -u)" != "0" ]; then
  	error "This script would need superuser privileges, use sudo"
  	usage 1
@@ -126,91 +290,258 @@ msg "Updating packages lists"
  if ! $APT update > /dev/null; then
      error "$APT update failed for some reason"
      exit 1
++=======
++	# 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=()
++	while IFS= read -r PACKAGE; do
++		PKG=${PACKAGE%:*}
++
++		# Test if PKG is still available
++	#	if ! grep -xFq "$PKG" <<<"$avail_pkgs"; then
++		if [[ -z ${avail[$PKG]+x} ]]; then
++
++			# 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-"
++
++				[[ $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 ]] && {
++
++						# 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+=" $PACKAGE/$RELEASE"
++		fi
++	done <$REVERTS
++	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}')"
++
++		[[ $yes ]] || {
++			read -p "$(msg 'Continue (Y/n)? ')" -r
++			[[ -z $REPLY || $REPLY =~ ^[Yy]$ ]] || exit
++		}
++	}
++
++	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."
++}
++
++if [[ ${RELEASE+x} ]]; then
++	[[ $RELEASE =~ ^[^/[:blank:]]+$ ]] || {
++		error "Invalid target release name :" \'"$RELEASE"\'
++	}
++else
++	RELEASE=$(lsb_release -c -s)
++>>>>>>> ppa-purge
  fi
--msg "PPA to be removed: $PPAOWNER $PPANAME"
++# Command line options
++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
++}
--# 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
++# Option name followed by ':' denotes an option that has an argument.
++# Options are separated by ','.
++params=$(env -u GETOPT_COMPATIBLE getopt -o siyhrv:V \
++-l simulate,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' ;;
++		-i|--initial-update ) 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) verbose="$2" ;;
++			 *) error "Invalid verbose level." 1 ;;
++			esac
++			shift 2; continue ;;
++		--figure-soname-bumps ) figure_soname=t ;;
++		-- ) # End of all options.
++			shift; break
++	esac
++	shift
++done
++
++distro=
++while [[ ${1-} ]]; do
++	if [[ $1 =~ ^ppa:([^/[:blank:]]+)(/[^/[:blank:]]+)?$ ]]; then
++		url=ppa.launchpad.net/${BASH_REMATCH[1]}${BASH_REMATCH[2]:-/ppa}/ubuntu
++	elif [[ $1  =~ ^https?://([^[:blank:]]*[^/[:blank:]])/?$ ]]; then
++		url=${BASH_REMATCH[1]}
++	else
++		distro=$1
  	fi
++	shift
  done
++<<<<<<< ppa-purge
  if [ ! -s $PPA_PKGS ]; then
  	error "Could not find package list for PPA: $PPAOWNER $PPANAME"
  	exit 1
  fi
++=======
++[[ -z $url && -z $distro ]] && {
++	error "No argument given. $(suggest_usage)"
++}
++>>>>>>> ppa-purge
--# Ignore the ppa-purge package
--if grep -q "ppa-purge" $PPA_PKGS; then
--	sed -i '/ppa-purge/d' $PPA_PKGS
--	msg "Note: Not removing ppa-purge package"
++# Make list of all packages available from the matching archive(s)
++[[ $url ]] && _url=${url//\//_} || _url='*'
++dir=
++if [[ ${distro: -1} == / ]]; then
++	[[ $url ]] || error 'No URL given'
++	dir=${distro:0:-1}; _dir=${dir//\//_}
  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
++if [ "$(id -u)" != "0" ]; then
++	error "This script would need superuser privileges, use sudo" 2
  fi
--# 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
++[[ $initial_update ]] && apt_update
++no_update=t
++
++msg "To be removed: ${url} ${distro}"
++
++for LIST in /var/lib/apt/lists/${_url}_*_Packages; do
++	if [ -f $LIST ]; then
++		nomatch=
++		if [[ $distro ]]; then
++			if [[ dir ]]; then
++				d=${LIST%_*}; d=${d#*${_url}_}
++				[[ $d == $_dir ]] || nomatch=t
++			else
++				d=${LIST##*_dists_}; d=${d%%_*}
++				[[ $d == $distro ]] || nomatch=t
++			fi
++		fi
++		[[ $nomatch ]] ||
++		 grep "^Package: " $LIST | cut -d " " -f2 >> $PKGS
  	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
++no_pkgs=
++if [ ! -s $PKGS ]; then
++	warn "Could not find matching packages."
++	no_pkgs=t
++else
++	# Get multi-arch package names for revert list
++	sort -u $PKGS | xargs dpkg-query -W \
++	 -f='${binary:Package}\t${db:Status-Abbrev}\n' 2>/dev/null |
++	  awk '/\tii $/{print $1}' > $REVERTS
++	>$PKGS
++fi
--REINSTALL=""
--for PACKAGE in $(cat $REVERTS); do
--	PKG=$(echo $PACKAGE | cut -d ':' -f1)
--	[[ $PACKAGE == *:* ]] && D_ARCH=":"$(echo $PACKAGE | cut -d ':' -f2)
++# Disable matching lines from sources.list files
++[[ $url ]] &&
++ regex='^deb(-src)?([[:blank:]]+\[.+\])?[[:blank:]]+https?://'"$(escape_regex "$url")"'/?[[:blank:]]+([^[:blank:]]+)' ||
++ regex='^deb(-src)?([[:blank:]]+\[.+\])?[[:blank:]]+https?://[^[:blank:]]+ +([^[:blank:]]+)'
++newlist=
++for LIST in $(find /etc/apt/ -name "*.list" -exec realpath -e '{}' \;); do
++	changed=
++	while read -r; do
++	 nomatch=
++	 [[ "$REPLY" =~ $regex ]] && {
++		 if [[ $distro ]]; then
++			[[ ${BASH_REMATCH[3]} == $distro ]] || nomatch=t;
++		 fi
++	 } || nomatch=t
--	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)
++	 [[ $nomatch ]] && newlist+="$REPLY"$'\n' || {
++		[[ $remove ]] && msg "Remove entry: $REPLY" || {
++			 newlist+="# $REPLY"$'\n'
++			 msg "Disable entry: $REPLY"
++		}
++		changed=t
++	 }
++	done <$LIST
--		APTAVAIL=$(grep-aptavail -eP  --pattern='^'$PAT'$' -s Package -n | sort -uV | sed -e '$!d')
++	[[ $changed ]] && {
++		msg "Making backup of .list file:"
++		mv -fvb "$LIST" "$LIST".save
++		lists+=("$LIST")
++		printf %s "$newlist" > "$LIST"
++	}
++	newlist=
++done
--		#explicitly remove packages that don't exist in archive
--		if [ "x$APTAVAIL" != "x$PKG" ]; then
--			REINSTALL="$REINSTALL $PACKAGE-"
--		fi
++(( ${#lists[@]} > 0 )) && {
++	[[ $yes ]] || {
++		read -p "$(msg 'Continue with these changes (Y/n)? ')" -r
++		[[ -z $REPLY || $REPLY =~ ^[Yy]$ ]] || exit
++	}
--		#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
++	no_update=
++	apt_update
--msg "Package revert list generated:"
--msg "$REINSTALL"
--echo
++	[[ $no_pkgs ]] || revert
--# FIXME:
--# Workaround for now in case APT fails. APTALT is a little more foregiving if the
--# revert list isn't 100% correct.
++	[[ $simulate ]] &&
++	 msg "Restoring repository entries, because this was just simulation:" \
++	 || restore=
++	# successful operation; no need to restore, unless in simulation mode.
++}
++<<<<<<< ppa-purge
  if $APT $APTARG install $REINSTALL; then
  	msg "PPA purged successfully"
  elif $APTALT $APTARG install $REINSTALL; then
@@ -219,4 +550,6 @@ else
  	error "Something went wrong, packages may not have been reverted"
  	exit 1
  fi
++=======
++>>>>>>> ppa-purge
  exit 0