summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-04-07 00:34:14 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-04-07 00:34:14 +0100
commit063aa12c7f9eecf2c517d4543e81e15b2a513200 (patch)
tree38d948f280da16472540ad9e457179b8fd181ff6
parentf932a5fcf6fcc7df65878901b2ced99021dd3ae2 (diff)
tiny adjustments/fixes, reduce the amount of redundant syncs
-rwxr-xr-xsrc/frontend/gui/sisyphus-gui.py6
-rwxr-xr-xsrc/helpers/make_local_csv_post4
-rwxr-xr-xsrc/helpers/make_local_csv_pre4
3 files changed, 5 insertions, 9 deletions
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py
index ef19995..085006f 100755
--- a/src/frontend/gui/sisyphus-gui.py
+++ b/src/frontend/gui/sisyphus-gui.py
@@ -201,7 +201,7 @@ class Sisyphus(QtWidgets.QMainWindow):
AND iv <> av
''' % (Sisyphus.applicationView, Sisyphus.searchTerm, noVirtual)),
])
- with sqlite3.connect(sisyphus_database_path) as db:
+ with sqlite3.connect(sisyphusDB) as db:
cursor = db.cursor()
cursor.execute('%s' % (self.SELECTS[Sisyphus.databaseView]))
rows = cursor.fetchall()
@@ -372,7 +372,6 @@ class MainWorker(QtCore.QObject):
def startInstall(self):
self.started.emit()
pkgList = Sisyphus.pkgList
- syncAll()
makeLocalDatabaseCSVpre()
portageExec = subprocess.Popen(
['emerge', '-q'] + pkgList, stdout=subprocess.PIPE)
@@ -387,7 +386,6 @@ class MainWorker(QtCore.QObject):
def startUninstall(self):
self.started.emit()
pkgList = Sisyphus.pkgList
- syncAll()
makeLocalDatabaseCSVpre()
portageExec = subprocess.Popen(
['emerge', '--depclean', '-q'] + pkgList, stdout=subprocess.PIPE)
@@ -401,7 +399,6 @@ class MainWorker(QtCore.QObject):
@QtCore.pyqtSlot()
def startUpgrade(self):
self.started.emit()
- syncAll()
makeLocalDatabaseCSVpre()
portageExec = subprocess.Popen(
['emerge', '-uDNq', '--backtrack=100', '--with-bdeps=y', '@world'], stdout=subprocess.PIPE)
@@ -415,7 +412,6 @@ class MainWorker(QtCore.QObject):
@QtCore.pyqtSlot()
def cleanOrphans(self):
self.started.emit()
- syncAll()
makeLocalDatabaseCSVpre()
portageExec = subprocess.Popen(
['emerge', '--depclean', '-q'], stdout=subprocess.PIPE)
diff --git a/src/helpers/make_local_csv_post b/src/helpers/make_local_csv_post
index 418cb77..438ef64 100755
--- a/src/helpers/make_local_csv_post
+++ b/src/helpers/make_local_csv_post
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
makecsv() {
- qlist -ICScv|sed -e "s/\//\,/" -e "s/[\t ]/\,/" -e "s/\:/\,/" >> /tmp/local_packages_post.csv
- mv /tmp/local_packages_post.csv /var/lib/sisyphus/csv/
+ qlist -ICScv|sed -e "s/\//\,/" -e "s/[\t ]/\,/" -e "s/\:/\,/" >> /tmp/localPackagesPost.csv
+ mv /tmp/localPackagesPost.csv /var/lib/sisyphus/csv/
}
makecsv
diff --git a/src/helpers/make_local_csv_pre b/src/helpers/make_local_csv_pre
index 53ac2c2..91e00bb 100755
--- a/src/helpers/make_local_csv_pre
+++ b/src/helpers/make_local_csv_pre
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
makecsv() {
- qlist -ICScv|sed -e "s/\//\,/" -e "s/[\t ]/\,/" -e "s/\:/\,/" >> /tmp/local_packages_pre.csv
- mv /tmp/local_packages_pre.csv /var/lib/sisyphus/csv/
+ qlist -ICScv|sed -e "s/\//\,/" -e "s/[\t ]/\,/" -e "s/\:/\,/" >> /tmp/localPackagesPre.csv
+ mv /tmp/localPackagesPre.csv /var/lib/sisyphus/csv/
}
makecsv