summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/autoremove.py2
-rw-r--r--src/backend/install.py2
-rw-r--r--src/backend/uninstall.py2
-rw-r--r--src/backend/update.py2
-rw-r--r--src/backend/upgrade.py2
-rw-r--r--src/frontend/gui/sisyphus-gui.py10
6 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/autoremove.py b/src/backend/autoremove.py
index c49787e..303b314 100644
--- a/src/backend/autoremove.py
+++ b/src/backend/autoremove.py
@@ -18,7 +18,7 @@ def start():
sys.exit("\nYou need root permissions to do this, exiting!\n")
-def startx():
+def xstart():
portageExec = subprocess.Popen(['emerge', '--depclean'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
# kill portage if the program dies or it's terminated by the user
atexit.register(sisyphus.killemerge.start, portageExec)
diff --git a/src/backend/install.py b/src/backend/install.py
index 1938d6d..581c69f 100644
--- a/src/backend/install.py
+++ b/src/backend/install.py
@@ -92,7 +92,7 @@ def estart(pkgname):
sys.exit("\nYou need root permissions to do this, exiting!\n")
-def startx(pkgname):
+def xstart(pkgname):
sisyphus.solvedeps.pkg.__wrapped__(pkgname) #undecorate
areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_pkg.pickle"), "rb"))
diff --git a/src/backend/uninstall.py b/src/backend/uninstall.py
index be1a1e3..0c22182 100644
--- a/src/backend/uninstall.py
+++ b/src/backend/uninstall.py
@@ -27,7 +27,7 @@ def fstart(pkgname):
sys.exit("\nYou need root permissions to do this, exiting!\n")
-def startx(pkgname):
+def xstart(pkgname):
portageExec = subprocess.Popen(['emerge', '--depclean'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
# kill portage if the program dies or it's terminated by the user
atexit.register(sisyphus.killemerge.start, portageExec)
diff --git a/src/backend/update.py b/src/backend/update.py
index d6d944e..a60c597 100644
--- a/src/backend/update.py
+++ b/src/backend/update.py
@@ -34,7 +34,7 @@ def start():
sys.exit("\nInvalid branch - binhost pairing; Use 'sisyphus branch --help' for help; Quitting.")
-def startx():
+def xstart():
activeBranch = sisyphus.checkenv.branch()
binhostURL = sisyphus.getenv.binhostURL()
isSane = sisyphus.checkenv.sanity()
diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py
index 5b51924..41d07f3 100644
--- a/src/backend/upgrade.py
+++ b/src/backend/upgrade.py
@@ -92,7 +92,7 @@ def estart():
sys.exit("\nYou need root permissions to do this, exiting!\n")
-def startx():
+def xstart():
sisyphus.solvedeps.world.__wrapped__() #undecorate
areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_world.pickle"), "rb"))
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py
index 5b054e4..9cad251 100644
--- a/src/frontend/gui/sisyphus-gui.py
+++ b/src/frontend/gui/sisyphus-gui.py
@@ -391,33 +391,33 @@ class MainWorker(QtCore.QObject):
def startUpdate(self):
self.started.emit()
sisyphus.setjobs.start()
- sisyphus.update.startx()
+ sisyphus.update.xstart()
self.finished.emit()
@QtCore.pyqtSlot()
def startInstall(self):
self.started.emit()
pkgname = Sisyphus.pkgname
- sisyphus.install.startx(pkgname)
+ sisyphus.install.xstart(pkgname)
self.finished.emit()
@QtCore.pyqtSlot()
def startUninstall(self):
self.started.emit()
pkgname = Sisyphus.pkgname
- sisyphus.uninstall.startx(pkgname)
+ sisyphus.uninstall.xstart(pkgname)
self.finished.emit()
@QtCore.pyqtSlot()
def startUpgrade(self):
self.started.emit()
- sisyphus.upgrade.startx()
+ sisyphus.upgrade.xstart()
self.finished.emit()
@QtCore.pyqtSlot()
def startAutoremove(self):
self.started.emit()
- sisyphus.autoremove.startx()
+ sisyphus.autoremove.xstart()
self.finished.emit()