no need for reinit hack

This commit is contained in:
Faik Uygur
2009-01-16 08:26:46 +00:00
parent db12695bd7
commit ad98eef38e
4 changed files with 14 additions and 10 deletions
+10 -1
View File
@@ -630,8 +630,18 @@ def remove_repo(name):
raise pisi.Error(_('Repository %s does not exist. Cannot remove.') raise pisi.Error(_('Repository %s does not exist. Cannot remove.')
% name) % name)
@locked
def update_repos(repos, force=False):
pisi.db.historydb.HistoryDB().create_history("repoupdate")
for repo in repos:
__update_repo(repo, force)
@locked @locked
def update_repo(repo, force=False): def update_repo(repo, force=False):
pisi.db.historydb.HistoryDB().create_history("repoupdate")
__update_repo(repo, force)
def __update_repo(repo, force=False):
ctx.ui.info(_('* Updating repository: %s') % repo) ctx.ui.info(_('* Updating repository: %s') % repo)
ctx.ui.notify(pisi.ui.updatingrepo, name = repo) ctx.ui.notify(pisi.ui.updatingrepo, name = repo)
repodb = pisi.db.repodb.RepoDB() repodb = pisi.db.repodb.RepoDB()
@@ -640,7 +650,6 @@ def update_repo(repo, force=False):
repouri = repodb.get_repo(repo).indexuri.get_uri() repouri = repodb.get_repo(repo).indexuri.get_uri()
try: try:
index.read_uri_of_repo(repouri, repo) index.read_uri_of_repo(repouri, repo)
pisi.db.historydb.HistoryDB().create_history("repoupdate")
pisi.db.historydb.HistoryDB().update_repo(repo, repouri, "update") pisi.db.historydb.HistoryDB().update_repo(repo, repouri, "update")
except pisi.file.AlreadyHaveException, e: except pisi.file.AlreadyHaveException, e:
ctx.ui.info(_('%s repository information is up-to-date.') % repo) ctx.ui.info(_('%s repository information is up-to-date.') % repo)
+1 -2
View File
@@ -55,5 +55,4 @@ If no repository is given, all repositories are updated.
else: else:
repos = pisi.api.list_repos() repos = pisi.api.list_repos()
for repo in repos: pisi.api.update_repos(repos, ctx.get_option('force'))
pisi.api.update_repo(repo, ctx.get_option('force'))
+1 -4
View File
@@ -86,10 +86,7 @@ expanded to package names.
if not ctx.get_option('bypass_update_repo'): if not ctx.get_option('bypass_update_repo'):
ctx.ui.info(_('Updating repositories')) ctx.ui.info(_('Updating repositories'))
repos = pisi.api.list_repos() repos = pisi.api.list_repos()
for repo in repos: pisi.api.update_repos(repos)
pisi.api.update_repo(repo)
# reinitialize after update repo operation
pisi.db.historydb.HistoryDB().init()
else: else:
ctx.ui.info(_('Will not update repositories')) ctx.ui.info(_('Will not update repositories'))
+2 -3
View File
@@ -34,9 +34,8 @@ class HistoryDB(lazydb.LazyDB):
return logs return logs
def create_history(self, operation): def create_history(self, operation):
if not self.history: self.history = pisi.history.History()
self.history = pisi.history.History() self.history.create(operation)
self.history.create(operation)
def add_and_update(self, pkgBefore=None, pkgAfter=None, operation=None, otype=None): def add_and_update(self, pkgBefore=None, pkgAfter=None, operation=None, otype=None):
self.add_package(pkgBefore, pkgAfter, operation, otype) self.add_package(pkgBefore, pkgAfter, operation, otype)