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

[entropy.db] complete API docstring and refactoring work

Browse Source
This commit is contained in:
Fabio Erculiani
2009-08-15 22:27:41 +02:00
parent ec3e35ed54
commit 89062bf8f3
18 changed files with 1207 additions and 1262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/text_query.py
+3 -1
View File
@@ -705,8 +705,10 @@ def search_removal_dependencies(atoms, deep = False, Equo = None):
print_generic(rematom)
continue
installedfrom = clientDbconn.retrievePackageFromInstalledTable(
installedfrom = clientDbconn.getInstalledPackageRepository(
idpackage)
if installedfrom is None:
installedfrom = _("Not available")
repo_info = bold("[") + red("%s: " % (_("from"),)) + \
brown(installedfrom)+bold("]")
stratomscounter = str(atomscounter)
client/text_rescue.py
+12 -8
View File
@@ -174,7 +174,7 @@ def database(options):
pass
idpk, rev, xx = Equo.clientDbconn.addPackage(mydata, revision = mydata['revision'])
Equo.clientDbconn.addPackageToInstalledTable(idpk,"gentoo-db")
Equo.clientDbconn.storeInstalledPackage(idpk,"gentoo-db")
os.remove(temptbz2)
print_info(red(" %s." % (_("All the Gentoo packages have been injected into Entropy database"),) ))
@@ -212,7 +212,7 @@ def database(options):
Equo.clientDbconn.removePackage(myidpackage)
print_info(red(" %s..." % (_("Now generating depends caching table"),) ))
Equo.clientDbconn.regenerateDependsTable()
Equo.clientDbconn.regenerateReverseDependenciesMetadata()
print_info(red(" %s...") % (_("Now indexing tables"),) )
Equo.clientDbconn.indexing = True
Equo.clientDbconn.createAllIndexes()
@@ -220,7 +220,11 @@ def database(options):
return 0
elif (options[0] == "check"):
if Equo.clientDbconn.doesTableExist("baseinfo"):
try:
valid = Equo.clientDbconn.validateDatabase()
except SystemDatabaseError:
valid = False
if valid:
Equo.client_repository_sanity_check()
else:
mytxt = "# %s: %s" % (bold(_("ATTENTION")),red(_("database does not exist or is badly broken")),)
@@ -372,7 +376,7 @@ def database(options):
print_info(red(" %s." % (_("Database resurrected successfully"),)))
print_info(red(" %s..." % (_("Now generating depends caching table"),)))
Equo.clientDbconn.regenerateDependsTable()
Equo.clientDbconn.regenerateReverseDependenciesMetadata()
print_info(red(" %s..." % (_("Now indexing tables"),)))
Equo.clientDbconn.indexing = True
Equo.clientDbconn.createAllIndexes()
@@ -388,7 +392,7 @@ def database(options):
return rc
print_info(red(" %s..." % (_("Regenerating depends caching table"),) ))
Equo.clientDbconn.regenerateDependsTable()
Equo.clientDbconn.regenerateReverseDependenciesMetadata()
print_info(red(" %s." % (_("Depends caching table regenerated successfully"),) ))
return 0
@@ -403,7 +407,7 @@ def database(options):
return rc
print_info(red(" %s..." % (_("Regenerating counters table"),) ))
Equo.clientDbconn.regenerateCountersTable(Spm.get_vdb_path(), output = True)
Equo.clientDbconn.regenerateSpmUidTable(verbose = True)
print_info(red(" %s" % (_("Counters table regenerated. Look above for errors."),) ))
return 0
@@ -606,8 +610,8 @@ def database(options):
mydata['revision'] = 9999 # can't do much more
idpk, rev, xx = Equo.clientDbconn.handlePackage(mydata, forcedRevision = mydata['revision'])
Equo.clientDbconn.removePackageFromInstalledTable(idpk)
Equo.clientDbconn.addPackageToInstalledTable(idpk,"gentoo-db")
Equo.clientDbconn.dropInstalledPackageFromStore(idpk)
Equo.clientDbconn.storeInstalledPackage(idpk,"gentoo-db")
os.remove(temptbz2)
print_info(brown(" @@ ")+blue("%s." % (_("Database update completed"),)))
client/text_smart.py
+1 -2
View File
@@ -310,7 +310,6 @@ def smartpackagegenerator(matchedPackages):
dbfile = unpackdir+"/db/merged.db"
mergeDbconn = Equo.open_generic_database(dbfile, dbname = "client")
mergeDbconn.initializeDatabase()
mergeDbconn.createXpakTable()
tmpdbfile = dbfile+"--readingdata"
for package in matchedPackages:
print_info(darkgreen(" * ")+brown(matchedAtoms[package]['atom'])+": "+red(_("collecting Entropy metadata")))
@@ -329,7 +328,7 @@ def smartpackagegenerator(matchedPackages):
# add
idpk, rev, y = mergeDbconn.handlePackage(data, forcedRevision = matchedAtoms[package]['revision']) # get the original rev
del y
mergeDbconn.storeXpakMetadata(idpk,xpakdata)
mergeDbconn.storeXpakMetadata(idpk, xpakdata)
mydbconn.closeDB()
os.remove(tmpdbfile)
client/text_ugc.py
+1 -1
View File
@@ -496,7 +496,7 @@ def ugcDocuments(options):
continue
doc_data = doc_data[0]
data, err_msg = Equo.UGC.remove_document_autosense(repository, identifier, doc_data['iddoctype'])
if data == False:
if data is False:
print_error(
"[%s:%s] %s: %s, %s" % (
darkgreen(repository),
client/text_ui.py
+19 -7
View File
@@ -372,7 +372,7 @@ def branchHop(branch):
if status:
Equo.clientDbconn.moveCountersToBranch(branch)
Equo.clientDbconn.moveSpmUidsToBranch(branch)
# remove old repos
for repo_path in old_repo_paths:
@@ -533,7 +533,9 @@ def _showPackageInfo(foundAtoms, deps):
idx = pkginstalled[0]
installedVer = Equo.clientDbconn.retrieveVersion(idx)
installedTag = Equo.clientDbconn.retrieveVersionTag(idx)
installedRepo = Equo.clientDbconn.retrievePackageFromInstalledTable(idx)
installedRepo = Equo.clientDbconn.getInstalledPackageRepository(idx)
if installedRepo is None:
installedRepo = _("Not available")
if not installedTag:
installedTag = "NoTag"
installedRev = Equo.clientDbconn.retrieveRevision(idx)
@@ -827,7 +829,9 @@ def installPackages(packages = [], atomsdata = [], deps = True, emptydeps = Fals
installedVer = Equo.clientDbconn.retrieveVersion(idx)
installedTag = Equo.clientDbconn.retrieveVersionTag(idx)
installedRev = Equo.clientDbconn.retrieveRevision(idx)
installedRepo = Equo.clientDbconn.retrievePackageFromInstalledTable(idx)
installedRepo = Equo.clientDbconn.getInstalledPackageRepository(idx)
if installedRepo is None:
installedRepo = _("Not available")
onDiskFreedSize += Equo.clientDbconn.retrieveOnDiskSize(idx)
if not (etpUi['ask'] or etpUi['pretend'] or etpUi['verbose']):
@@ -897,7 +901,9 @@ def installPackages(packages = [], atomsdata = [], deps = True, emptydeps = Fals
if not pkgatom:
continue
onDiskFreedSize += Equo.clientDbconn.retrieveOnDiskSize(idpackage)
installedfrom = Equo.clientDbconn.retrievePackageFromInstalledTable(idpackage)
installedfrom = Equo.clientDbconn.getInstalledPackageRepository(idpackage)
if installedfrom is None:
installedfrom = _("Not available")
repoinfo = red("[")+brown("%s: " % (_("from"),) )+bold(installedfrom)+red("] ")
print_info(red(" ## ")+"["+red("W")+"] "+repoinfo+enlightenatom(pkgatom))
@@ -1281,7 +1287,9 @@ def configurePackages(packages = []):
pkgatom = Equo.clientDbconn.retrieveAtom(idpackage)
if not pkgatom: continue
installedfrom = Equo.clientDbconn.retrievePackageFromInstalledTable(idpackage)
installedfrom = Equo.clientDbconn.getInstalledPackageRepository(idpackage)
if installedfrom is None:
installedfrom = _("Not available")
mytxt = " | %s: " % (_("Installed from"),)
print_info(" # "+red("(")+brown(str(atomscounter))+"/"+blue(str(totalatoms))+red(")")+" "+enlightenatom(pkgatom)+mytxt+red(installedfrom))
@@ -1402,8 +1410,10 @@ def removePackages(packages = [], atomsdata = [], deps = True, deep = False,
plainRemovalQueue.append(idpackage)
installedfrom = Equo.clientDbconn.retrievePackageFromInstalledTable(
installedfrom = Equo.clientDbconn.getInstalledPackageRepository(
idpackage)
if installedfrom is None:
installedfrom = _("Not available")
disksize = Equo.clientDbconn.retrieveOnDiskSize(idpackage)
disksize = Equo.entropyTools.bytes_into_human(disksize)
disksizeinfo = " | %s: %s" % (blue(_("Disk size")),
@@ -1452,7 +1462,9 @@ def removePackages(packages = [], atomsdata = [], deps = True, deep = False,
rematom = Equo.clientDbconn.retrieveAtom(idpackage)
if not rematom:
continue
installedfrom = Equo.clientDbconn.retrievePackageFromInstalledTable(idpackage)
installedfrom = Equo.clientDbconn.getInstalledPackageRepository(idpackage)
if installedfrom is None:
installedfrom = _("Not available")
disksize = Equo.clientDbconn.retrieveOnDiskSize(idpackage)
disksize = Equo.entropyTools.bytes_into_human(disksize)
repositoryInfo = bold("[")+darkgreen("%s:" % (_("from"),) )+brown(installedfrom)+bold("]")