[elbe-devel] [PATCH v2 1/2] elbepack.gpg: rename into elbepack.egpg

[Manuel Traut]

gpg is the name of a popular python module. That will
be used by elbe in the future. To easily allow importing
it from within elbepack and to avoid confusion this
renames the elbepack.gpg module into egpg.

Signed-off-by: Manuel Traut <manut at linutronix.de>
---
 debian/python-elbe-common.install  | 2 +-
 debian/python3-elbe-common.install | 2 +-
 elbepack/commands/remove_sign.py   | 2 +-
 elbepack/commands/sign.py          | 2 +-
 elbepack/debinstaller.py           | 2 +-
 elbepack/{gpg.py => egpg.py}       | 0
 elbepack/repomanager.py            | 2 +-
 elbepack/updated.py                | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename elbepack/{gpg.py => egpg.py} (100%)

diff --git a/debian/python-elbe-common.install b/debian/python-elbe-common.install
index e4edc8f9..38436425 100644
--- a/debian/python-elbe-common.install
+++ b/debian/python-elbe-common.install
@@ -16,7 +16,7 @@
 ./usr/lib/python2.*/*-packages/elbepack/elbexml.py
 ./usr/lib/python2.*/*-packages/elbepack/elbeproject.py
 ./usr/lib/python2.*/*-packages/elbepack/filesystem.py
-./usr/lib/python2.*/*-packages/elbepack/gpg.py
+./usr/lib/python2.*/*-packages/elbepack/egpg.py
 ./usr/lib/python2.*/*-packages/elbepack/hashes.py
 ./usr/lib/python2.*/*-packages/elbepack/initvmaction.py
 ./usr/lib/python2.*/*-packages/elbepack/kvm.py
diff --git a/debian/python3-elbe-common.install b/debian/python3-elbe-common.install
index 94398a51..893ae396 100644
--- a/debian/python3-elbe-common.install
+++ b/debian/python3-elbe-common.install
@@ -16,7 +16,7 @@
 ./usr/lib/python3.*/*-packages/elbepack/elbexml.py
 ./usr/lib/python3.*/*-packages/elbepack/elbeproject.py
 ./usr/lib/python3.*/*-packages/elbepack/filesystem.py
-./usr/lib/python3.*/*-packages/elbepack/gpg.py
+./usr/lib/python3.*/*-packages/elbepack/egpg.py
 ./usr/lib/python3.*/*-packages/elbepack/hashes.py
 ./usr/lib/python3.*/*-packages/elbepack/initvmaction.py
 ./usr/lib/python3.*/*-packages/elbepack/kvm.py
diff --git a/elbepack/commands/remove_sign.py b/elbepack/commands/remove_sign.py
index 1905ef25..cad72052 100644
--- a/elbepack/commands/remove_sign.py
+++ b/elbepack/commands/remove_sign.py
@@ -6,7 +6,7 @@
 
 from __future__ import print_function
 
-from elbepack.gpg import unsign_file
+from elbepack.egpg import unsign_file
 
 
 def run_command(argv):
diff --git a/elbepack/commands/sign.py b/elbepack/commands/sign.py
index d7d2620f..744b51ef 100644
--- a/elbepack/commands/sign.py
+++ b/elbepack/commands/sign.py
@@ -6,7 +6,7 @@
 
 from __future__ import print_function
 
-from elbepack.gpg import sign_file
+from elbepack.egpg import sign_file
 
 
 def run_command(argv):
diff --git a/elbepack/debinstaller.py b/elbepack/debinstaller.py
index 0160f6dc..1a46b353 100644
--- a/elbepack/debinstaller.py
+++ b/elbepack/debinstaller.py
@@ -27,7 +27,7 @@ from shutil import copyfileobj, copyfile
 from gpgme import Context
 
 from elbepack.filesystem import TmpdirFilesystem
-from elbepack.gpg import OverallStatus, check_signature
+from elbepack.egpg import OverallStatus, check_signature
 from elbepack.shellhelper import CommandError, system
 from elbepack.hashes import HashValidator, HashValidationFailed
 
diff --git a/elbepack/gpg.py b/elbepack/egpg.py
similarity index 100%
rename from elbepack/gpg.py
rename to elbepack/egpg.py
diff --git a/elbepack/repomanager.py b/elbepack/repomanager.py
index 08c9fee5..9719a1ea 100644
--- a/elbepack/repomanager.py
+++ b/elbepack/repomanager.py
@@ -15,7 +15,7 @@ from debian.deb822 import Deb822
 from elbepack.debianreleases import codename2suite
 from elbepack.filesystem import Filesystem
 from elbepack.pkgutils import get_dsc_size
-from elbepack.gpg import generate_elbe_internal_key, export_key
+from elbepack.egpg import generate_elbe_internal_key, export_key
 from elbepack.shellhelper import CommandError
 
 
diff --git a/elbepack/updated.py b/elbepack/updated.py
index 58a25fff..adad4cce 100644
--- a/elbepack/updated.py
+++ b/elbepack/updated.py
@@ -33,7 +33,7 @@ import apt_pkg
 
 from elbepack.aptprogress import (ElbeInstallProgress,
                                   ElbeAcquireProgress, ElbeOpProgress)
-from elbepack.gpg import unsign_file
+from elbepack.egpg import unsign_file
 from elbepack.treeutils import etree
 
 downgrade_prevention_feature_available = True
-- 
2.20.1