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

Entropy/database split:

Browse Source 
- some changes to allow easy branch migration through the 'switchbranch' tool


git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2498 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
lxnay
2008-10-08 13:36:40 +00:00
parent 30782e37ed
commit b5ec9b033d
3 changed files with 65 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/reagent.py
+1 -1
View File
@@ -74,7 +74,7 @@ myopts = [
(2,'remove',4,_('remove the provided atoms from the current repository database')),
(2,'multiremove',3,_('remove the provided injected atoms (all if no atom specified)')),
(2,'create-empty-database',2,_('create an empty repository database in the provided path')),
(2,'switchbranch <new_branch>',3,_('switch to the specified branch the provided atoms (or world)')),
(2,'switchbranch <from branch> <to branch>',3,_('switch to the specified branch the repository')),
(2,'md5check',3,_('verify integrity of the provided atoms (or world)')),
(2,'md5remote',3,_('verify remote integrity of the provided atoms (or world)')),
None,
server/server_reagent.py
+10 -19
View File
@@ -322,28 +322,16 @@ def database(options):
print_error(brown(" * ")+red(_("Not enough parameters")))
return 1
switchbranch = options[1]
from_branch = options[1]
to_branch = options[2]
print_info(darkgreen(" * ")+red(_("Switching branch, be sure to have your packages in sync.")))
print_info(darkgreen(" * ")+red("%s %s..." % (_("Collecting packages that would be marked"),switchbranch,) ), back = True)
print_info(darkgreen(" * ")+red("%s %s..." % (_("Collecting packages that would be marked"),to_branch,) ), back = True)
dbconn = Entropy.openServerDatabase(read_only = True, no_upload = True)
pkglist = set()
myatoms = options[2:]
if "world" in myatoms:
pkglist |= dbconn.listAllIdpackages()
else:
for atom in myatoms:
match = dbconn.atomMatch(atom)
if match == -1:
print_warning(brown(" * ")+red("%s: " % (_("Cannot match"),) )+bold(atom))
else:
pkglist.add(match[0])
pkglist = dbconn.listAllIdpackages(branch = from_branch)
myatoms = options[3:]
if not pkglist:
print_error(brown(" * ")+red("%s." % (_("No packages found"),) ))
return 3
print_info(darkgreen(" * ")+red("%s %s:" % (_("These are the packages that would be marked"),switchbranch,)))
print_info(darkgreen(" * ")+red("%s %s:" % (_("These are the packages that would be marked"),to_branch,)))
for idpackage in pkglist:
atom = dbconn.retrieveAtom(idpackage)
print_info(red(" # ")+bold(atom))
@@ -352,7 +340,10 @@ def database(options):
if rc == "No":
return 4
switched, already_switched, ignored, not_found, no_checksum = Entropy.switch_packages_branch(pkglist, to_branch = switchbranch)
status = Entropy.switch_packages_branch(pkglist, from_branch, to_branch)
if status == None:
return 1
switched, already_switched, ignored, not_found, no_checksum = status
if not_found or no_checksum:
return 1
return 0