File 0001-Add-command-abbreviations-RhBug-1634232.patch of Package dnf

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Add-command-abbreviations-RhBug-1634232.patch of Package dnf (Revision ebddd38a56b7a9e76ec089d9d0a90f7b)

Currently displaying revision ebddd38a56b7a9e76ec089d9d0a90f7b , Show latest

From da52d0ee8ec53fc67477a448ef9da73e32ce2cf2 Mon Sep 17 00:00:00 2001
From: Pavla Kratochvilova <pkratoch@redhat.com>
Date: Thu, 13 Dec 2018 15:24:10 +0100
Subject: [PATCH 1/2] Add command abbreviations (RhBug:1634232)

https://bugzilla.redhat.com/show_bug.cgi?id=1634232
These aliases were removed by commit 359f95a4f4e2390641deb88ab3464239e0f76b4b
For each command, only one alias is added, the rest is put into aliases
config that is not included by default.
---
 dnf.spec                           | 1 +
 dnf/cli/commands/__init__.py       | 4 ++--
 dnf/cli/commands/distrosync.py     | 2 +-
 dnf/cli/commands/downgrade.py      | 2 +-
 dnf/cli/commands/group.py          | 2 +-
 dnf/cli/commands/install.py        | 2 +-
 dnf/cli/commands/makecache.py      | 2 +-
 dnf/cli/commands/reinstall.py      | 2 +-
 dnf/cli/commands/remove.py         | 2 +-
 dnf/cli/commands/repoquery.py      | 2 +-
 dnf/cli/commands/search.py         | 2 +-
 dnf/cli/commands/shell.py          | 2 +-
 dnf/cli/commands/upgrade.py        | 2 +-
 dnf/cli/commands/upgrademinimal.py | 2 +-
 etc/dnf/aliases.d/CMakeLists.txt   | 1 +
 etc/dnf/aliases.d/zypper.conf      | 7 +++++++
 16 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 etc/dnf/aliases.d/CMakeLists.txt
 create mode 100644 etc/dnf/aliases.d/zypper.conf

diff --git a/dnf.spec b/dnf.spec
index b2caa788..ddc92c7b 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -412,6 +412,7 @@ ln -sr  %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars
 %dir %{confdir}/protected.d
 %dir %{confdir}/vars
 %dir %{confdir}/aliases.d
+%exclude %{confdir}/aliases.d/zypper.conf
 %config(noreplace) %{confdir}/%{name}.conf
 %config(noreplace) %{confdir}/protected.d/%{name}.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
diff --git a/dnf/cli/commands/__init__.py b/dnf/cli/commands/__init__.py
index 0ed55b9e..a688ac7e 100644
--- a/dnf/cli/commands/__init__.py
+++ b/dnf/cli/commands/__init__.py
@@ -235,7 +235,7 @@ class ProvidesCommand(Command):
     provides command.
     """
 
-    aliases = ('provides', 'whatprovides')
+    aliases = ('provides', 'whatprovides', 'prov')
     summary = _('find what package provides the given value')
 
     @staticmethod
@@ -816,7 +816,7 @@ class HistoryCommand(Command):
     history command.
     """
 
-    aliases = ('history',)
+    aliases = ('history', 'hist')
     summary = _('display, or use, the transaction history')
 
     transaction_ids = set()
diff --git a/dnf/cli/commands/distrosync.py b/dnf/cli/commands/distrosync.py
index 2a6062e7..3d472e5f 100644
--- a/dnf/cli/commands/distrosync.py
+++ b/dnf/cli/commands/distrosync.py
@@ -28,7 +28,7 @@ class DistroSyncCommand(commands.Command):
     distro-synch command.
     """
 
-    aliases = ('distro-sync', 'distrosync', 'distribution-synchronization')
+    aliases = ('distro-sync', 'distrosync', 'distribution-synchronization', 'dsync')
     summary = _('synchronize installed packages to the latest available versions')
 
     @staticmethod
diff --git a/dnf/cli/commands/downgrade.py b/dnf/cli/commands/downgrade.py
index f528ddc5..9e27962b 100644
--- a/dnf/cli/commands/downgrade.py
+++ b/dnf/cli/commands/downgrade.py
@@ -30,7 +30,7 @@ class DowngradeCommand(commands.Command):
     downgrade command.
     """
 
-    aliases = ('downgrade',)
+    aliases = ('downgrade', 'dg')
     summary = _("Downgrade a package")
 
     @staticmethod
diff --git a/dnf/cli/commands/group.py b/dnf/cli/commands/group.py
index c53bf01f..744c1e05 100644
--- a/dnf/cli/commands/group.py
+++ b/dnf/cli/commands/group.py
@@ -41,7 +41,7 @@ class GroupCommand(commands.Command):
                        'groupremove'  : 'remove',
                        'grouperase'   : 'remove',
                        'groupinfo'    : 'info'}
-    aliases = ('group', 'groups') + tuple(direct_commands.keys())
+    aliases = ('group', 'groups', 'grp') + tuple(direct_commands.keys())
     summary = _('display, or use, the groups information')
 
     _CMD_ALIASES = {'update'     : 'upgrade',
diff --git a/dnf/cli/commands/install.py b/dnf/cli/commands/install.py
index c53724a2..f9df6618 100644
--- a/dnf/cli/commands/install.py
+++ b/dnf/cli/commands/install.py
@@ -43,7 +43,7 @@ class InstallCommand(commands.Command):
                    'install-nevra': hawkey.FORM_NEVRA}
     alternatives_provide = 'alternative-for({})'
 
-    aliases = ('install', 'localinstall') + tuple(nevra_forms.keys())
+    aliases = ('install', 'localinstall', 'in') + tuple(nevra_forms.keys())
     summary = _('install a package or packages on your system')
 
     @staticmethod
diff --git a/dnf/cli/commands/makecache.py b/dnf/cli/commands/makecache.py
index c631dca2..c367b1ee 100644
--- a/dnf/cli/commands/makecache.py
+++ b/dnf/cli/commands/makecache.py
@@ -33,7 +33,7 @@ logger = logging.getLogger("dnf")
 
 
 class MakeCacheCommand(commands.Command):
-    aliases = ('makecache',)
+    aliases = ('makecache', 'mc')
     summary = _('generate the metadata cache')
 
     @staticmethod
diff --git a/dnf/cli/commands/reinstall.py b/dnf/cli/commands/reinstall.py
index e00b6bff..2b3ceac7 100644
--- a/dnf/cli/commands/reinstall.py
+++ b/dnf/cli/commands/reinstall.py
@@ -34,7 +34,7 @@ class ReinstallCommand(commands.Command):
     """A class containing methods needed by the cli to execute the reinstall command.
     """
 
-    aliases = ('reinstall',)
+    aliases = ('reinstall', 'rei')
     summary = _('reinstall a package')
 
     @staticmethod
diff --git a/dnf/cli/commands/remove.py b/dnf/cli/commands/remove.py
index 3f2303b0..3c50e48c 100644
--- a/dnf/cli/commands/remove.py
+++ b/dnf/cli/commands/remove.py
@@ -42,7 +42,7 @@ class RemoveCommand(commands.Command):
                    'erase-na': hawkey.FORM_NA,
                    'erase-nevra': hawkey.FORM_NEVRA}
 
-    aliases = ('remove', 'erase',) + tuple(nevra_forms.keys())
+    aliases = ('remove', 'erase', 'rm') + tuple(nevra_forms.keys())
     summary = _('remove a package or packages from your system')
 
     @staticmethod
diff --git a/dnf/cli/commands/repoquery.py b/dnf/cli/commands/repoquery.py
index 56e7cac6..941a4709 100644
--- a/dnf/cli/commands/repoquery.py
+++ b/dnf/cli/commands/repoquery.py
@@ -100,7 +100,7 @@ class RepoQueryCommand(commands.Command):
                    'repoquery-na': hawkey.FORM_NA,
                    'repoquery-nevra': hawkey.FORM_NEVRA}
 
-    aliases = ('repoquery',) + tuple(nevra_forms.keys())
+    aliases = ('repoquery', 'rq') + tuple(nevra_forms.keys())
     summary = _('search for packages matching keyword')
 
     @staticmethod
diff --git a/dnf/cli/commands/search.py b/dnf/cli/commands/search.py
index a3d8e96d..47c83143 100644
--- a/dnf/cli/commands/search.py
+++ b/dnf/cli/commands/search.py
@@ -42,7 +42,7 @@ class SearchCommand(commands.Command):
     search command.
     """
 
-    aliases = ('search',)
+    aliases = ('search', 'se')
     summary = _('search package details for the given string')
 
     @staticmethod
diff --git a/dnf/cli/commands/shell.py b/dnf/cli/commands/shell.py
index 0a7485bb..e3cae74d 100644
--- a/dnf/cli/commands/shell.py
+++ b/dnf/cli/commands/shell.py
@@ -43,7 +43,7 @@ class ShellDemandSheet(object):
 
 class ShellCommand(commands.Command, cmd.Cmd):
 
-    aliases = ('shell',)
+    aliases = ('shell', 'sh')
     summary = _('run an interactive DNF shell')
 
     MAPPING = {'repo': 'repo',
diff --git a/dnf/cli/commands/upgrade.py b/dnf/cli/commands/upgrade.py
index d8cad5ff..44789c9a 100644
--- a/dnf/cli/commands/upgrade.py
+++ b/dnf/cli/commands/upgrade.py
@@ -36,7 +36,7 @@ class UpgradeCommand(commands.Command):
     """A class containing methods needed by the cli to execute the
     update command.
     """
-    aliases = ('upgrade', 'update', 'upgrade-to', 'update-to', 'localupdate')
+    aliases = ('upgrade', 'update', 'upgrade-to', 'update-to', 'localupdate', 'up')
     summary = _('upgrade a package or packages on your system')
 
     @staticmethod
diff --git a/dnf/cli/commands/upgrademinimal.py b/dnf/cli/commands/upgrademinimal.py
index 9992bc6e..a770e2b7 100644
--- a/dnf/cli/commands/upgrademinimal.py
+++ b/dnf/cli/commands/upgrademinimal.py
@@ -27,7 +27,7 @@ class UpgradeMinimalCommand(UpgradeCommand):
     command.
     """
 
-    aliases = ('upgrade-minimal', 'update-minimal')
+    aliases = ('upgrade-minimal', 'update-minimal', 'up-min')
     summary = _("upgrade, but only 'newest' package match which fixes a problem"
                 " that affects your system")
 
diff --git a/etc/dnf/aliases.d/CMakeLists.txt b/etc/dnf/aliases.d/CMakeLists.txt
new file mode 100644
index 00000000..7c674409
--- /dev/null
+++ b/etc/dnf/aliases.d/CMakeLists.txt
@@ -0,0 +1 @@
+INSTALL (FILES "zypper.conf" DESTINATION ${SYSCONFDIR}/dnf/aliases.d)
diff --git a/etc/dnf/aliases.d/zypper.conf b/etc/dnf/aliases.d/zypper.conf
new file mode 100644
index 00000000..613f33c3
--- /dev/null
+++ b/etc/dnf/aliases.d/zypper.conf
@@ -0,0 +1,7 @@
+[aliases]
+dup = distro-sync
+dist-upgrade = distro-sync
+ref = makecache
+refresh = makecache
+ri = reinstall
+
-- 
2.20.1

Places

File 0001-Add-command-abbreviations-RhBug-1634232.patch of Package dnf (Revision ebddd38a56b7a9e76ec089d9d0a90f7b)

Places