fetchList -> dl_list; gentooRepoDir -> g_src_dir; redcoreRepoDir -> r_src_dir; portageConfigDir -> p_cfg_dir; portageCacheDir -> p_cch_dir; portageDistDir -> p_dst_dir; portageMetadataDir -> p_mtd_dir

9 files changed, 90 insertions, 90 deletions

diff --git a/src/backend/download.py b/src/backend/download.py
index f6f2651..507f893 100644
--- a/src/backend/download.py
+++ b/src/backend/download.py
@@ -10,41 +10,41 @@ import sisyphus.killemerge
 
 
 def pkgbinpkgonly():
-    fetchList = []
+    dl_list = []
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
-        sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb"))
+        sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb"))
 
     for index, binary in enumerate(['=' + package for package in bin_list]):
-        fetchList.append(binary)
+        dl_list.append(binary)
 
     p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly',
-                              '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList))
+                              '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(dl_list))
     p_exe.wait()
 
 
 def pkgbinpkg():
-    fetchList = []
+    dl_list = []
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
-        sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb"))
+        sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb"))
 
     for index, binary in enumerate(['=' + package for package in bin_list]):
-        fetchList.append(binary)
+        dl_list.append(binary)
 
     p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--fetchonly',
-                              '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList))
+                              '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(dl_list))
     p_exe.wait()
 
 
 def xpkgbinpkgonly():
-    fetchList = []
+    dl_list = []
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
-        sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb"))
+        sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb"))
 
     for index, binary in enumerate(['=' + package for package in bin_list]):
-        fetchList.append(binary)
+        dl_list.append(binary)
 
     p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', '--rebuilt-binaries',
-                              '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                              '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(dl_list), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     # kill portage if the program dies or it's terminated by the user
     atexit.register(sisyphus.killemerge.start, p_exe)
 
@@ -55,41 +55,41 @@ def xpkgbinpkgonly():
 
 
 def worldbinpkgonly():
-    fetchList = []
+    dl_list = []
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
-        sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb"))
+        sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb"))
 
     for index, binary in enumerate(['=' + package for package in bin_list]):
-        fetchList.append(binary)
+        dl_list.append(binary)
 
     p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly',
-                              '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList))
+                              '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(dl_list))
     p_exe.wait()
 
 
 def worldbinpkg():
-    fetchList = []
+    dl_list = []
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
-        sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb"))
+        sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb"))
 
     for index, binary in enumerate(['=' + package for package in bin_list]):
-        fetchList.append(binary)
+        dl_list.append(binary)
 
     p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--fetchonly',
-                              '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList))
+                              '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(dl_list))
     p_exe.wait()
 
 
 def xworldbinpkgonly():
-    fetchList = []
+    dl_list = []
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
-        sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb"))
+        sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb"))
 
     for index, binary in enumerate(['=' + package for package in bin_list]):
-        fetchList.append(binary)
+        dl_list.append(binary)
 
     p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', '--rebuilt-binaries',
-                              '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                              '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(dl_list), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     # kill portage if the program dies or it's terminated by the user
     atexit.register(sisyphus.killemerge.start, p_exe)
 
diff --git a/src/backend/getenv.py b/src/backend/getenv.py
index 13b3831..42429f2 100644
--- a/src/backend/getenv.py
+++ b/src/backend/getenv.py
@@ -41,8 +41,8 @@ def csv_addr():
 def sys_brch():
     act_brch = None
 
-    if os.path.isdir(os.path.join(sisyphus.getfs.gentooRepoDir, '.git')):
-        os.chdir(sisyphus.getfs.gentooRepoDir)
+    if os.path.isdir(os.path.join(sisyphus.getfs.g_src_dir, '.git')):
+        os.chdir(sisyphus.getfs.g_src_dir)
         lcl_brch = subprocess.check_output(
             ['git', 'rev-parse', '--abbrev-ref', 'HEAD'])
 
diff --git a/src/backend/getfs.py b/src/backend/getfs.py
index 676f501..9196e75 100644
--- a/src/backend/getfs.py
+++ b/src/backend/getfs.py
@@ -10,12 +10,12 @@ gentooRepo = 'portage.git'
 redcoreRepo = 'redcore-desktop.git'
 portageConfigRepo = 'redcore-build.git'
 
-gentooRepoDir = '/usr/ports/gentoo'
-redcoreRepoDir = '/usr/ports/redcore'
-portageConfigDir = '/opt/redcore-build'
-portageCacheDir = '/var/cache/packages'
-portageDistDir = '/var/cache/distfiles'
-portageMetadataDir = '/var/cache/edb'
+g_src_dir = '/usr/ports/gentoo'
+r_src_dir = '/usr/ports/redcore'
+p_cfg_dir = '/opt/redcore-build'
+p_cch_dir = '/var/cache/packages'
+p_dst_dir = '/var/cache/distfiles'
+p_mtd_dir = '/var/cache/edb'
 
 rmt_pcsv = '/var/lib/sisyphus/csv/remotePackagesPre.csv'
 rmt_dcsv = '/var/lib/sisyphus/csv/remoteDescriptionsPre.csv'
diff --git a/src/backend/install.py b/src/backend/install.py
index d3338bf..4ca84c2 100644
--- a/src/backend/install.py
+++ b/src/backend/install.py
@@ -21,12 +21,12 @@ def start(pkgname):
         sisyphus.update.start()
         sisyphus.solvedeps.pkg(pkgname)
         bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
-            sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb"))
+            sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb"))
 
         if need_cfg == 0:
             if len(src_list) == 0:
                 if not len(bin_list) == 0:
-                    os.chdir(sisyphus.getfs.portageCacheDir)
+                    os.chdir(sisyphus.getfs.p_cch_dir)
                     print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
                         bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
                     while True:
@@ -76,12 +76,12 @@ def estart(pkgname):
         sisyphus.update.start()
         sisyphus.solvedeps.pkg(pkgname)
         bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
-            sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb"))
+            sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb"))
 
         if need_cfg == 0:
             if len(src_list) == 0:
                 if not len(bin_list) == 0:
-                    os.chdir(sisyphus.getfs.portageCacheDir)
+                    os.chdir(sisyphus.getfs.p_cch_dir)
                     print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
                         bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
                     while True:
@@ -109,7 +109,7 @@ def estart(pkgname):
                     sys.exit()
             else:
                 if not len(bin_list) == 0:
-                    os.chdir(sisyphus.getfs.portageCacheDir)
+                    os.chdir(sisyphus.getfs.p_cch_dir)
                     print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
                         bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
                     print("\n" + sisyphus.getcolor.green + "These are the source packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.green + ", ".join(
@@ -172,9 +172,9 @@ def estart(pkgname):
 def xstart(pkgname):
     sisyphus.solvedeps.pkg.__wrapped__(pkgname)  # undecorate
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
-        sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb"))
+        sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "rb"))
 
-    os.chdir(sisyphus.getfs.portageCacheDir)
+    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()
diff --git a/src/backend/purgeenv.py b/src/backend/purgeenv.py
index 53aaf27..5222414 100644
--- a/src/backend/purgeenv.py
+++ b/src/backend/purgeenv.py
@@ -8,63 +8,63 @@ import sisyphus.getfs
 
 @animation.wait('purging branch configuration')
 def branch():
-    if os.path.isdir(sisyphus.getfs.gentooRepoDir):
-        for files in os.listdir(sisyphus.getfs.gentooRepoDir):
-            if os.path.isfile(os.path.join(sisyphus.getfs.gentooRepoDir, files)):
-                os.remove(os.path.join(sisyphus.getfs.gentooRepoDir, files))
+    if os.path.isdir(sisyphus.getfs.g_src_dir):
+        for files in os.listdir(sisyphus.getfs.g_src_dir):
+            if os.path.isfile(os.path.join(sisyphus.getfs.g_src_dir, files)):
+                os.remove(os.path.join(sisyphus.getfs.g_src_dir, files))
             else:
                 shutil.rmtree(os.path.join(
-                    sisyphus.getfs.gentooRepoDir, files))
+                    sisyphus.getfs.g_src_dir, files))
     else:
-        os.makedirs(sisyphus.getfs.gentooRepoDir)
+        os.makedirs(sisyphus.getfs.g_src_dir)
 
-    if os.path.isdir(sisyphus.getfs.redcoreRepoDir):
-        for files in os.listdir(sisyphus.getfs.redcoreRepoDir):
-            if os.path.isfile(os.path.join(sisyphus.getfs.redcoreRepoDir, files)):
-                os.remove(os.path.join(sisyphus.getfs.redcoreRepoDir, files))
+    if os.path.isdir(sisyphus.getfs.r_src_dir):
+        for files in os.listdir(sisyphus.getfs.r_src_dir):
+            if os.path.isfile(os.path.join(sisyphus.getfs.r_src_dir, files)):
+                os.remove(os.path.join(sisyphus.getfs.r_src_dir, files))
             else:
                 shutil.rmtree(os.path.join(
-                    sisyphus.getfs.redcoreRepoDir, files))
+                    sisyphus.getfs.r_src_dir, files))
     else:
-        os.makedirs(sisyphus.getfs.redcoreRepoDir)
+        os.makedirs(sisyphus.getfs.r_src_dir)
 
-    if os.path.isdir(sisyphus.getfs.portageConfigDir):
-        for files in os.listdir(sisyphus.getfs.portageConfigDir):
-            if os.path.isfile(os.path.join(sisyphus.getfs.portageConfigDir, files)):
-                os.remove(os.path.join(sisyphus.getfs.portageConfigDir, files))
+    if os.path.isdir(sisyphus.getfs.p_cfg_dir):
+        for files in os.listdir(sisyphus.getfs.p_cfg_dir):
+            if os.path.isfile(os.path.join(sisyphus.getfs.p_cfg_dir, files)):
+                os.remove(os.path.join(sisyphus.getfs.p_cfg_dir, files))
             else:
                 shutil.rmtree(os.path.join(
-                    sisyphus.getfs.portageConfigDir, files))
+                    sisyphus.getfs.p_cfg_dir, files))
     else:
-        os.makedirs(sisyphus.getfs.portageConfigDir)
+        os.makedirs(sisyphus.getfs.p_cfg_dir)
 
 
 @animation.wait('purging cached files')
 def cache():
-    if os.path.isdir(sisyphus.getfs.portageCacheDir):
-        for files in os.listdir(sisyphus.getfs.portageCacheDir):
-            if os.path.isfile(os.path.join(sisyphus.getfs.portageCacheDir, files)):
-                os.remove(os.path.join(sisyphus.getfs.portageCacheDir, files))
+    if os.path.isdir(sisyphus.getfs.p_cch_dir):
+        for files in os.listdir(sisyphus.getfs.p_cch_dir):
+            if os.path.isfile(os.path.join(sisyphus.getfs.p_cch_dir, files)):
+                os.remove(os.path.join(sisyphus.getfs.p_cch_dir, files))
             else:
                 shutil.rmtree(os.path.join(
-                    sisyphus.getfs.portageCacheDir, files))
+                    sisyphus.getfs.p_cch_dir, files))
 
-    if os.path.isdir(sisyphus.getfs.portageDistDir):
-        for files in os.listdir(sisyphus.getfs.portageDistDir):
-            if os.path.isfile(os.path.join(sisyphus.getfs.portageDistDir, files)):
-                os.remove(os.path.join(sisyphus.getfs.portageDistDir, files))
+    if os.path.isdir(sisyphus.getfs.p_dst_dir):
+        for files in os.listdir(sisyphus.getfs.p_dst_dir):
+            if os.path.isfile(os.path.join(sisyphus.getfs.p_dst_dir, files)):
+                os.remove(os.path.join(sisyphus.getfs.p_dst_dir, files))
             else:
                 shutil.rmtree(os.path.join(
-                    sisyphus.getfs.portageDistDir, files))
+                    sisyphus.getfs.p_dst_dir, files))
 
 
 @animation.wait('purging metadata files')
 def metadata():
-    if os.path.isdir(sisyphus.getfs.portageMetadataDir):
-        for files in os.listdir(sisyphus.getfs.portageMetadataDir):
-            if os.path.isfile(os.path.join(sisyphus.getfs.portageMetadataDir, files)):
+    if os.path.isdir(sisyphus.getfs.p_mtd_dir):
+        for files in os.listdir(sisyphus.getfs.p_mtd_dir):
+            if os.path.isfile(os.path.join(sisyphus.getfs.p_mtd_dir, files)):
                 os.remove(os.path.join(
-                    sisyphus.getfs.portageMetadataDir, files))
+                    sisyphus.getfs.p_mtd_dir, files))
             else:
                 shutil.rmtree(os.path.join(
-                    sisyphus.getfs.portageMetadataDir, files))
+                    sisyphus.getfs.p_mtd_dir, files))
diff --git a/src/backend/setbranch.py b/src/backend/setbranch.py
index 0bb25c6..1403414 100644
--- a/src/backend/setbranch.py
+++ b/src/backend/setbranch.py
@@ -43,9 +43,9 @@ def injectGentooRepo(branch, remote):
     gentooRemote, redcoreRemote, portageConfigRemote = getBranchRemote(
         branch, remote)
 
-    if not os.path.isdir(os.path.join(sisyphus.getfs.gentooRepoDir, '.git')):
+    if not os.path.isdir(os.path.join(sisyphus.getfs.g_src_dir, '.git')):
         git.Repo.clone_from("/".join(gentooRemote),
-                            sisyphus.getfs.gentooRepoDir, depth=1, branch=branch)
+                            sisyphus.getfs.g_src_dir, depth=1, branch=branch)
 
 
 @animation.wait('injecting Redcore Linux ebuild overlay')
@@ -53,9 +53,9 @@ def injectRedcoreRepo(branch, remote):
     gentooRemote, redcoreRemote, portageConfigRemote = getBranchRemote(
         branch, remote)
 
-    if not os.path.isdir(os.path.join(sisyphus.getfs.redcoreRepoDir, '.git')):
+    if not os.path.isdir(os.path.join(sisyphus.getfs.r_src_dir, '.git')):
         git.Repo.clone_from("/".join(redcoreRemote),
-                            sisyphus.getfs.redcoreRepoDir, depth=1, branch=branch)
+                            sisyphus.getfs.r_src_dir, depth=1, branch=branch)
 
 
 @animation.wait('injecting Redcore Linux portage config')
@@ -63,9 +63,9 @@ def injectPortageConfigRepo(branch, remote):
     gentooRemote, redcoreRemote, portageConfigRemote = getBranchRemote(
         branch, remote)
 
-    if not os.path.isdir(os.path.join(sisyphus.getfs.portageConfigDir, '.git')):
+    if not os.path.isdir(os.path.join(sisyphus.getfs.p_cfg_dir, '.git')):
         git.Repo.clone_from("/".join(portageConfigRemote),
-                            sisyphus.getfs.portageConfigDir, depth=1, branch=branch)
+                            sisyphus.getfs.p_cfg_dir, depth=1, branch=branch)
 
 
 def giveWarning(branch, remote):
diff --git a/src/backend/solvedeps.py b/src/backend/solvedeps.py
index bc6f4bc..4e2f5d5 100644
--- a/src/backend/solvedeps.py
+++ b/src/backend/solvedeps.py
@@ -42,7 +42,7 @@ def pkg(pkgname):
             src_list.append(is_src)
 
     pickle.dump([bin_list, src_list, need_cfg], open(os.path.join(
-        sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "wb"))
+        sisyphus.getfs.p_mtd_dir, "sisyphus_pkgdeps.pickle"), "wb"))
 
 
 @animation.wait('resolving dependencies')
@@ -80,4 +80,4 @@ def world():
             src_list.append(is_src)
 
     pickle.dump([bin_list, src_list, need_cfg], open(os.path.join(
-        sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "wb"))
+        sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "wb"))
diff --git a/src/backend/syncenv.py b/src/backend/syncenv.py
index eef7fb1..840a74c 100644
--- a/src/backend/syncenv.py
+++ b/src/backend/syncenv.py
@@ -6,7 +6,7 @@ import sisyphus.getfs
 
 
 def gentooRepo():
-    os.chdir(sisyphus.getfs.gentooRepoDir)
+    os.chdir(sisyphus.getfs.g_src_dir)
     lcl_brch = subprocess.check_output(
         ['git', 'rev-parse', '--abbrev-ref', 'HEAD'])
     rmt_brch = subprocess.check_output(
@@ -22,7 +22,7 @@ def gentooRepo():
 
 
 def redcoreRepo():
-    os.chdir(sisyphus.getfs.redcoreRepoDir)
+    os.chdir(sisyphus.getfs.r_src_dir)
     lcl_brch = subprocess.check_output(
         ['git', 'rev-parse', '--abbrev-ref', 'HEAD'])
     rmt_brch = subprocess.check_output(
@@ -38,7 +38,7 @@ def redcoreRepo():
 
 
 def portageConfigRepo():
-    os.chdir(sisyphus.getfs.portageConfigDir)
+    os.chdir(sisyphus.getfs.p_cfg_dir)
     lcl_brch = subprocess.check_output(
         ['git', 'rev-parse', '--abbrev-ref', 'HEAD'])
     rmt_brch = subprocess.check_output(
diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py
index c79adcc..66a9da4 100644
--- a/src/backend/upgrade.py
+++ b/src/backend/upgrade.py
@@ -21,12 +21,12 @@ def start():
         sisyphus.update.start()
         sisyphus.solvedeps.world()
         bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
-            sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb"))
+            sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb"))
 
         if need_cfg == 0:
             if len(src_list) == 0:
                 if not len(bin_list) == 0:
-                    os.chdir(sisyphus.getfs.portageCacheDir)
+                    os.chdir(sisyphus.getfs.p_cch_dir)
                     print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
                         bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
                     while True:
@@ -76,12 +76,12 @@ def estart():
         sisyphus.update.start()
         sisyphus.solvedeps.world()
         bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
-            sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb"))
+            sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb"))
 
         if need_cfg == 0:
             if len(src_list) == 0:
                 if not len(bin_list) == 0:
-                    os.chdir(sisyphus.getfs.portageCacheDir)
+                    os.chdir(sisyphus.getfs.p_cch_dir)
                     print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
                         bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
                     while True:
@@ -109,7 +109,7 @@ def estart():
                     sys.exit()
             else:
                 if not len(bin_list) == 0:
-                    os.chdir(sisyphus.getfs.portageCacheDir)
+                    os.chdir(sisyphus.getfs.p_cch_dir)
                     print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
                         bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
                     print("\n" + sisyphus.getcolor.green + "These are the source packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.green + ", ".join(
@@ -172,14 +172,14 @@ def estart():
 def xstart():
     sisyphus.solvedeps.world.__wrapped__()  # undecorate
     bin_list, src_list, need_cfg = pickle.load(open(os.path.join(
-        sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb"))
+        sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb"))
 
     if not len(src_list) == 0:
         print("\n" + "Source package(s) found in the mix;" + " " + "Use sisyphus CLI:" + " " + "'" +
               "sisyphus upgrade --ebuild" + "'" + " " + "to perform the upgrade;" + " " + "Aborting." + "\n")
     else:
         if not len(bin_list) == 0:
-            os.chdir(sisyphus.getfs.portageCacheDir)
+            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()