Skip to content

Remove support for defunct 'deborphan' #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rrthomas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove support for defunct 'deborphan' #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion TUTORIAL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ Examples commands include:
$ wajig listfiles less (list the files supplied by the "less" pkg)
$ wajig whichpkg stdio.h (what package supplies this header file)
$ wajig whatis rats (one line description of the package "rats")
$ wajig orphans (list libraries not required by other pkgs)

For a complete list of available commands, 'wajig list-commands'.

Expand Down
1 change: 0 additions & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ Suggests: debconf,
fakeroot,
apt-file,
locales,
deborphan,
vrms,
sudo,
apt-show-versions,
Expand Down
1 change: 0 additions & 1 deletion docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ $ wajig restart apache (restart the apache daemon)
$ wajig listfiles less (list the files supplied by the "less" pkg)
$ wajig whichpkg stdio.h (what package supplies this header file)
$ wajig whatis rats (one line description of the package "rats")
$ wajig orphans (list libraries not required by other pkgs)
```

For a complete list of available commands:
Expand Down
27 changes: 0 additions & 27 deletions wajig/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,15 +708,6 @@ def help(args):
)
parser_nonfree.set_defaults(func=function)

function = commands.orphans
parser_orphans = subparsers.add_parser(
"orphans",
parents=[parser_teach],
aliases="orphaned listorphaned listorphans".split(),
description=function.__doc__,
)
parser_orphans.set_defaults(func=function)

# PASSWORD

function = commands.password
Expand Down Expand Up @@ -752,15 +743,6 @@ def help(args):
parser_purge.add_argument("packages", nargs="+")
parser_purge.set_defaults(func=function)

function = commands.purgeorphans
parser_purgeorphans = subparsers.add_parser(
"purgeorphans",
aliases=["purge-orphans"],
parents=[parser_yesno, parser_teach],
description=function.__doc__,
)
parser_purgeorphans.set_defaults(func=function)

function = commands.purgeremoved
parser_purgeremoved = subparsers.add_parser(
"purgeremoved",
Expand Down Expand Up @@ -857,15 +839,6 @@ def help(args):
parser_remove.add_argument("packages", nargs="+")
parser_remove.set_defaults(func=function)

function = commands.removeorphans
parser_removeorphans = subparsers.add_parser(
"removeorphans",
aliases=["remove-orphans"],
parents=[parser_yesno],
description=function.__doc__,
)
parser_removeorphans.set_defaults(func=function)

function = commands.repackage
parser_repackage = subparsers.add_parser(
"repackage",
Expand Down
12 changes: 6 additions & 6 deletions wajig/bash_completion.d/wajig.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ builddeps|changelog|clean|commands|contents|dailyupgrade|dependents|describe|des
distupgrade|download|editsources|extract|fixconfigure|fixinstall|fixmissing|force|hold|\
info|init|install|installsuggested|integrity|large|lastupdate|listall|listalternatives|listcache|\
listdaemons|listfiles|listhold|listinstalled|listlog|listnames|listpackages|listscripts|listsection|\
listsections|liststatus|localupgrade|madison|move|new|newdetail|news|nonfree|orphans|passwords|policy|\
purge|purgeorphans|purgeremoved|rbuilddeps|readme|reboot|recdownload|recommended|reconfigure|\
reinstall|reload|remove|removeorphans|repackage|reportbug|repos|restart|rmrepo|rpm2deb|\
listsections|liststatus|localupgrade|madison|move|new|newdetail|news|nonfree|passwords|policy|\
purge|purgeremoved|rbuilddeps|readme|reboot|recdownload|recommended|reconfigure|\
reinstall|reload|remove|repackage|reportbug|repos|restart|rmrepo|rpm2deb|\
rpminstall|safeupgrade|safe-upgrade|search|\
searchapt|show|sizes|snapshot|source|start|status|stop|sysinfo|tasksel|todo|toupgrade|\
tutorial|unhold|unofficial|update|updatealternatives|updatepciids|updateusbids|upgrade|upgradesecurity|\
Expand Down Expand Up @@ -127,11 +127,11 @@ verify|version|versions|whichpackage) ]];
listinstalled listlog listnames listpackages
listscripts listsection listsections liststatus
localupgrade madison move new newdetail news
newupgrades new-upgrades nonfree orphans passwords
policy purge purgeorphans purge-orphans purgeremoved
newupgrades new-upgrades nonfree passwords
policy purge purgeremoved
purge-removed rbuilddeps readme reboot recdownload
recommended reconfigure reinstall reload remove
removeorphans repackage reportbug repos restart
repackage reportbug repos restart
rmrepo rpm2deb rpminstall safeupgrade safe-upgrade
search searchapt show sizes snapshot source start
status stop sysinfo tasksel todo toupgrade
Expand Down
32 changes: 0 additions & 32 deletions wajig/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,12 +838,6 @@ def nonfree(args):
perform.execute("vrms", teach=args.teach, noop=args.noop)


def orphans(args):
"""List libraries not required by any installed package """
util.requires_package("deborphan")
perform.execute("deborphan", teach=args.teach, noop=args.noop)


# PASSWORD

def password(args):
Expand Down Expand Up @@ -885,20 +879,6 @@ def purge(args):
perform.execute(command, root=True, log=True, teach=args.teach, noop=args.noop)


def purgeorphans(args):
"""Purge orphaned libraries (not required by installed packages)"""
# Deborphans does not require root, but dpkg does,
# so build up the orphans list first, then pass that to dpkg.
util.requires_package("deborphan")
packages = ""
for package in perform.execute("deborphan", pipe=True):
packages += " " + package.strip()
if packages:
command = "/usr/bin/apt-get --auto-remove purge {} {}"
command = command.format(args.yes, packages)
perform.execute(command, root=True, log=True, teach=args.teach, noop=args.noop)


def purgeremoved(args):
"""Purge all packages marked as deinstall"""
packages = ""
Expand Down Expand Up @@ -1023,18 +1003,6 @@ def remove(args):
perform.execute(command, root=True, log=True, teach=args.teach, noop=args.noop)


def removeorphans(args):
"""Remove orphaned libraries"""
util.requires_package("deborphan")
packages = ""
for package in perform.execute("deborphan", pipe=True):
packages += " " + package.strip()
if packages:
command = "/usr/bin/apt-get --auto-remove remove {} {}"
command = command.format(args.yes, packages)
perform.execute(command, root=True, log=True, teach=args.teach, noop=args.noop)


def repackage(args):
"""Generate a .deb file from an installed package"""
util.requires_package("dpkg-repack")
Expand Down
6 changes: 3 additions & 3 deletions wajig/shell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ def main():
# "listpackages", "listscripts", "listsection",
# "listsections", "liststatus", "localupgrade",
# "madison", "move", "new", "newdetail", "news",
# "nonfree", "orphans", "passwords", "policy", "purge",
# "purgeorphans", "purgeremoved", "rbuilddeps",
# "nonfree", "passwords", "policy", "purge",
# "purgeremoved", "rbuilddeps",
# "readme", "reboot", "recdownload", "recommended",
# "reconfigure", "reinstall", "reload", "remove",
# "removeorphans", "repackage", "reportbug", "repos",
# "repackage", "reportbug", "repos",
# "restart", "rmrepo", "rpm2deb", "rpminstall",
# "search", "searchapt", "show", "sizes", "snapshot",
# "source", "start", "status", "stop", "sysinfo",
Expand Down