sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- added more human interaction on equo world

Browse Source 
- added --ask option to equo database gentoosync

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@911 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
(no author)
2007-12-19 08:40:16 +00:00
parent 4d4d2b6e25
commit 49598dabcd
2 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/rescueTools.py
+5 -3
View File
@@ -280,7 +280,7 @@ def database(options):
print_info(red(" Counters table regenerated. Check above for errors."))
return 0
elif (options[0] == "gentoosync"): # FIXME: add --ask
elif (options[0] == "gentoosync"):
try:
import portageTools
@@ -361,7 +361,8 @@ def database(options):
for x in toBeRemoved:
atom = clientDbconn.retrieveAtom(x)
print_info(brown(" # ")+red(atom))
rc = entropyTools.askquestion(">> Continue with removal?")
rc = "Yes"
if etpUi['ask']: rc = entropyTools.askquestion(">> Continue with removal?")
if rc == "Yes":
for x in toBeRemoved:
atom = clientDbconn.retrieveAtom(x)
@@ -373,7 +374,8 @@ def database(options):
print_info(brown(" @@ ")+blue("Someone added these packages. Would be added/updated into the Entropy database:"))
for x in toBeAdded:
print_info(yellow(" # ")+red(x[0]))
rc = entropyTools.askquestion(">> Continue with adding?")
rc = "Yes"
if etpUi['ask']: rc = entropyTools.askquestion(">> Continue with adding?")
if rc == "No":
return 0
# now analyze
client/uiTools.py
+30 -18
View File
@@ -106,7 +106,7 @@ def package(options):
elif (options[0] == "world"):
equoTools.loadCaches()
rc, status = worldUpdate(onlyfetch = equoRequestOnlyFetch, replay = (equoRequestReplay or equoRequestEmptyDeps), upgradeTo = equoRequestUpgradeTo, resume = equoRequestResume, skipfirst = equoRequestSkipfirst)
rc, status = worldUpdate(onlyfetch = equoRequestOnlyFetch, replay = (equoRequestReplay or equoRequestEmptyDeps), upgradeTo = equoRequestUpgradeTo, resume = equoRequestResume, skipfirst = equoRequestSkipfirst, human = True)
elif (options[0] == "remove"):
if myopts or equoRequestResume:
@@ -121,7 +121,7 @@ def package(options):
return rc
def worldUpdate(onlyfetch = False, replay = False, upgradeTo = None, resume = False, skipfirst = False, returnQueue = False):
def worldUpdate(onlyfetch = False, replay = False, upgradeTo = None, resume = False, skipfirst = False, returnQueue = False, human = False):
# check if I am root
if (not entropyTools.isRoot()):
@@ -275,21 +275,15 @@ def worldUpdate(onlyfetch = False, replay = False, upgradeTo = None, resume = Fa
if not (etpUi['quiet'] or returnQueue): print_info(red(" @@ ")+blue("Even if they are usually harmless, it is suggested to remove them."))
if (not etpUi['pretend']):
if (etpUi['ask']):
rc = entropyTools.askquestion(" Would you like to query them ?")
if rc == "No":
clientDbconn.closeDB()
if human:
rc = entropyTools.askquestion(" Would you like to query them ?")
if rc == "No":
clientDbconn.closeDB()
del clientDbconn
return 0,0
else:
if not (etpUi['quiet'] or returnQueue):
print_info(red(" @@ ")+blue("Running query in ")+red("5 seconds")+blue("..."))
print_info(red(" @@ ")+blue(":: Hit CTRL+C to stop"))
import time
time.sleep(5)
return 0,0
# run removePackages with --nodeps
worldQueue['removePackages'], rc = removePackages(atomsdata = removedList, deps = False, systemPackagesCheck = False, configFiles = True, resume = resume, returnQueue = returnQueue)
worldQueue['removePackages'], rc = removePackages(atomsdata = removedList, deps = False, systemPackagesCheck = False, configFiles = True, resume = resume, returnQueue = returnQueue, human = human)
else:
if not (etpUi['quiet'] or returnQueue): print_info(red(" @@ ")+blue("Calculation complete."))
@@ -982,7 +976,7 @@ def installPackages(packages = [], atomsdata = [], deps = True, emptydeps = Fals
return 0,0
def removePackages(packages = [], atomsdata = [], deps = True, deep = False, systemPackagesCheck = True, configFiles = False, resume = False, returnQueue = False):
def removePackages(packages = [], atomsdata = [], deps = True, deep = False, systemPackagesCheck = True, configFiles = False, resume = False, returnQueue = False, human = False):
# check if I am root
if (not entropyTools.isRoot()):
@@ -1017,7 +1011,7 @@ def removePackages(packages = [], atomsdata = [], deps = True, deep = False, sys
foundAtoms = _foundAtoms
# are packages in foundAtoms?
if (len(foundAtoms) == 0):
if (not foundAtoms):
if not (etpUi['quiet'] or returnQueue): print_error(red("No packages found"))
return 125,-1
@@ -1110,8 +1104,11 @@ def removePackages(packages = [], atomsdata = [], deps = True, deep = False, sys
else:
if not (etpUi['quiet'] or returnQueue): writechar("\n")
if (etpUi['ask']):
rc = entropyTools.askquestion(" Would you like to proceed?")
if (etpUi['ask']) or human:
question = " Would you like to proceed?"
if human:
question = " Would you like to proceed with a selective removal ?"
rc = entropyTools.askquestion(question)
if rc == "No":
clientDbconn.closeDB()
del clientDbconn
@@ -1160,6 +1157,7 @@ def removePackages(packages = [], atomsdata = [], deps = True, deep = False, sys
returnActionQueue['queue'] = removalQueue[:]
returnActionQueue['data'] = {}
totalqueue = str(len(removalQueue))
currentqueue = 0
for idpackage in removalQueue:
currentqueue += 1
@@ -1179,6 +1177,7 @@ def removePackages(packages = [], atomsdata = [], deps = True, deep = False, sys
resume_cache['removalQueue'].remove(idpackage)
dumpTools.dumpobj(etpCache['remove'],resume_cache)
continue
infoDict['diffremoval'] = False
infoDict['removeconfig'] = configFiles
@@ -1201,6 +1200,19 @@ def removePackages(packages = [], atomsdata = [], deps = True, deep = False, sys
else:
# if human
if not (etpUi['quiet'] or returnQueue): print_info(red(" -- ")+bold("(")+blue(str(currentqueue))+"/"+red(totalqueue)+bold(") ")+">>> "+darkgreen(infoDict['removeatom']))
if human:
rc = entropyTools.askquestion(" Remove this one ?")
if rc == "No":
# update resume cache
resume_cache['removalQueue'].remove(idpackage)
dumpTools.dumpobj(etpCache['remove'],resume_cache)
# unload dict
if not returnQueue:
del etpRemovalTriggers[infoDict['removeatom']]
continue
for step in steps:
rc = equoTools.stepExecutor(step,infoDict,str(currentqueue)+"/"+str(len(removalQueue)))
if (rc != 0):