more cryptic changes

3 files changed, 26 insertions, 26 deletions

diff --git a/src/backend/download.py b/src/backend/download.py
index 507f893..1d78eaf 100644
--- a/src/backend/download.py
+++ b/src/backend/download.py
@@ -9,39 +9,39 @@ import sisyphus.getfs
 import sisyphus.killemerge
 
 
-def pkgbinpkgonly():
+def dl_pbin_only():
     dl_list = []
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
         sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb"))
 
-    for index, binary in enumerate(['=' + package for package in bin_list]):
-        dl_list.append(binary)
+    for index, pbin in enumerate(['=' + package for package in bin_list]):
+        dl_list.append(pbin)
 
     p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly',
                               '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(dl_list))
     p_exe.wait()
 
 
-def pkgbinpkg():
+def dl_pbin():
     dl_list = []
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
         sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb"))
 
-    for index, binary in enumerate(['=' + package for package in bin_list]):
-        dl_list.append(binary)
+    for index, pbin in enumerate(['=' + package for package in bin_list]):
+        dl_list.append(pbin)
 
     p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--fetchonly',
                               '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(dl_list))
     p_exe.wait()
 
 
-def xpkgbinpkgonly():
+def xdl_pbin_only():
     dl_list = []
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
         sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb"))
 
-    for index, binary in enumerate(['=' + package for package in bin_list]):
-        dl_list.append(binary)
+    for index, pbin in enumerate(['=' + package for package in bin_list]):
+        dl_list.append(pbin)
 
     p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', '--rebuilt-binaries',
                               '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(dl_list), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -54,39 +54,39 @@ def xpkgbinpkgonly():
     p_exe.wait()
 
 
-def worldbinpkgonly():
+def dl_wpbin_only():
     dl_list = []
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
         sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb"))
 
-    for index, binary in enumerate(['=' + package for package in bin_list]):
-        dl_list.append(binary)
+    for index, pbin in enumerate(['=' + package for package in bin_list]):
+        dl_list.append(pbin)
 
     p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly',
                               '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(dl_list))
     p_exe.wait()
 
 
-def worldbinpkg():
+def dl_wpbin():
     dl_list = []
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
         sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb"))
 
-    for index, binary in enumerate(['=' + package for package in bin_list]):
-        dl_list.append(binary)
+    for index, pbin in enumerate(['=' + package for package in bin_list]):
+        dl_list.append(pbin)
 
     p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--fetchonly',
                               '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(dl_list))
     p_exe.wait()
 
 
-def xworldbinpkgonly():
+def xdl_wpbin_only():
     dl_list = []
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
         sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb"))
 
-    for index, binary in enumerate(['=' + package for package in bin_list]):
-        dl_list.append(binary)
+    for index, pbin in enumerate(['=' + package for package in bin_list]):
+        dl_list.append(pbin)
 
     p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', '--rebuilt-binaries',
                               '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(dl_list), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
diff --git a/src/backend/install.py b/src/backend/install.py
index 4ca84c2..aa5a8cb 100644
--- a/src/backend/install.py
+++ b/src/backend/install.py
@@ -33,7 +33,7 @@ def start(pkgname):
                         user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
-                            sisyphus.download.pkgbinpkgonly()
+                            sisyphus.download.dl_pbin_only()
                             p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly',
                                                       '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
                             p_exe.wait()
@@ -88,7 +88,7 @@ def estart(pkgname):
                         user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
-                            sisyphus.download.pkgbinpkgonly()
+                            sisyphus.download.dl_pbin_only()
                             p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly',
                                                       '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
                             p_exe.wait()
@@ -118,7 +118,7 @@ def estart(pkgname):
                         user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
-                            sisyphus.download.pkgbinpkg()
+                            sisyphus.download.dl_pbin()
                             p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--rebuilt-binaries',
                                                       '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
                             p_exe.wait()
@@ -177,7 +177,7 @@ def xstart(pkgname):
     os.chdir(sisyphus.getfs.p_cch_dir)
     print("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + ", ".join(
         bin_list) + "\n\n" + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + "\n\n")
-    sisyphus.download.xpkgbinpkgonly()
+    sisyphus.download.xdl_pbin_only()
     p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
                               '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     # kill portage if the program dies or it's terminated by the user
diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py
index 66a9da4..53b2e80 100644
--- a/src/backend/upgrade.py
+++ b/src/backend/upgrade.py
@@ -33,7 +33,7 @@ def start():
                         user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No " + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
-                            sisyphus.download.worldbinpkgonly()
+                            sisyphus.download.dl_wpbin_only()
                             p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly',
                                                       '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'])
                             p_exe.wait()
@@ -88,7 +88,7 @@ def estart():
                         user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
-                            sisyphus.download.worldbinpkgonly()
+                            sisyphus.download.dl_wpbin_only()
                             p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly',
                                                       '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'])
                             p_exe.wait()
@@ -118,7 +118,7 @@ def estart():
                         user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
                                            "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
                         if user_input.lower() in ['yes', 'y', '']:
-                            sisyphus.download.worldbinpkg()
+                            sisyphus.download.dl_wpbin()
                             p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg',
                                                       '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'])
                             p_exe.wait()
@@ -182,7 +182,7 @@ def xstart():
             os.chdir(sisyphus.getfs.p_cch_dir)
             print("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + ", ".join(
                 bin_list) + "\n\n" + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + "\n\n")
-            sisyphus.download.xworldbinpkgonly()
+            sisyphus.download.xdl_wpbin_only()
             p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
                                       '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             # kill portage if the program dies or it's terminated by the user