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

Entropy/TODO:

Browse Source 
- update TODO
Entropy/entropyConstants:
- remove conflicting_tagged_packages from etpConst and move to a 'per-repo' config file
Entropy/SystemSettings:
- handle new conflicting tagged packages file per-repo
Entropy/RepoInterface:
- when syncing the repo, download the new conflicting tagged packages file
Entropy/ServerInterface:
- handle the new conflicting tagged packages file (upload/download)


git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@2911 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
lxnay
2009-01-16 15:36:54 +00:00
parent 83b5030e40
commit 582eab8eae
4 changed files with 72 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@@ -1,9 +1,7 @@
TODO list
- add changelog to packages
- move etpConst['conflicting_tagged_packages'] elsewhere
- decide what to do about smart apps and if it's better waiting for app-directory packages support
- reorganize etpConst parser
- documentation + man page
Repository Manager:
@@ -12,7 +10,6 @@ TODO list
- implement packages.db.system_mask management
Proposed for Entropy >1.0 (require API changes):
- Entropy structure refactoring
- UGC: personal package sets
- UGC: bug report documents?
- UGC: bbcode docs?

17
conf/packages/packages.db.conflicting_tagged.example Normal file
View File

@@ -0,0 +1,17 @@
# Server side packages.db.conflicting_tagged file, containing tagged/slotted package
# keys that cannot installed at the same time.
# For example, even if nvidia-drivers packages are slotted and tagged by kernel release
# you cannot have more than one installed due to obvious libGL issues
# LINE CONSTRUCTION:
# <package key (only key!)> <conflicting package atom 1> <conflicting package atom 2> ...
# See examples below
# EXAMPLE:
# x11-drivers/nvidia-drivers x11-drivers/nvidia-drivers
# x11-drivers/foo x11-drivers/foo-old x11-drivers/foo-veryold
# PRESET:
x11-drivers/nvidia-drivers x11-drivers/nvidia-drivers
x11-drivers/ati-drivers x11-drivers/ati-drivers

64
libraries/entropy.py
View File

@@ -4242,11 +4242,12 @@ class EquoInterface(TextInterface):
if (kernelstuff) and (not kernelstuff_kernel):
# add kname to the dependency
data['dependencies']["=sys-kernel/linux-"+kname+"-"+kver] = 0
key = data['category']+"/"+data['name']
if etpConst['conflicting_tagged_packages'].has_key(key):
myconflicts = etpConst['conflicting_tagged_packages'][key]
for conflict in myconflicts:
data['conflicts'].append(conflict)
# Conflicting tagged packages support
key = data['category']+"/"+data['name']
confl_data = self.SystemSettings['conflicting_tagged_packages'].get(key)
if confl_data != None:
for conflict in confl_data: data['conflicts'].append(conflict)
# Get License text if possible
licenses_dir = os.path.join(Spm.get_spm_setting('PORTDIR'),'licenses')
@@ -6488,7 +6489,7 @@ class RepoInterface:
self.supported_download_items = (
"db","rev","ck",
"lock","mask","system_mask","dbdump",
"lock","mask","system_mask","dbdump", "conflicting_tagged",
"dbdumpck","lic_whitelist","make.conf",
"package.mask","package.unmask","package.keywords","profile.link",
"package.use","server.cert","ca.cert",
@@ -6639,6 +6640,9 @@ class RepoInterface:
elif item == "system_mask":
url = etpRepositories[repo]['database'] + "/" + etpConst['etpdatabasesytemmaskfile']
filepath = etpRepositories[repo]['dbpath'] + "/" + etpConst['etpdatabasesytemmaskfile']
elif item == "conflicting_tagged":
url = etpRepositories[repo]['database'] + "/" + etpConst['etpdatabaseconflictingtaggedfile']
filepath = etpRepositories[repo]['dbpath'] + "/" + etpConst['etpdatabaseconflictingtaggedfile']
elif item == "make.conf":
myfile = os.path.basename(etpConst['spm']['global_make_conf'])
url = etpRepositories[repo]['database'] + "/" + myfile
@@ -7940,6 +7944,16 @@ class RepoInterface:
red("..."),
)
),
(
"conflicting_tagged",
etpConst['etpdatabaseconflictingtaggedfile'],
True,
"%s %s %s" % (
red(_("Downloading conflicting tagged packages file")),
darkgreen(etpConst['etpdatabaseconflictingtaggedfile']),
red("..."),
)
),
(
"lic_whitelist",
etpConst['etpdatabaselicwhitelistfile'],
@@ -10505,6 +10519,7 @@ class SystemSettings:
'repos_mask': {},
'repos_license_whitelist': {},
'system_package_sets': {},
'conflicting_tagged_packages': {},
'system_dirs': etpConst['confdir']+"/fsdirs.conf",
'system_dirs_mask': etpConst['confdir']+"/fsdirsmask.conf",
}
@@ -10526,7 +10541,6 @@ class SystemSettings:
'repos_system_mask': {},
'repos_mask': {},
'repos_license_whitelist': {},
'system_package_sets': {},
}
self.__settings = None
@@ -10651,6 +10665,7 @@ class SystemSettings:
maskpath = os.path.join(etpRepositories[repoid]['dbpath'],etpConst['etpdatabasemaskfile'])
wlpath = os.path.join(etpRepositories[repoid]['dbpath'],etpConst['etpdatabaselicwhitelistfile'])
sm_path = os.path.join(etpRepositories[repoid]['dbpath'],etpConst['etpdatabasesytemmaskfile'])
ct_path = os.path.join(etpRepositories[repoid]['dbpath'],etpConst['etpdatabaseconflictingtaggedfile'])
if os.path.isfile(maskpath) and os.access(maskpath,os.R_OK):
self.etpSettingFiles['repos_mask'][repoid] = maskpath
self.etpMtimeFiles['repos_mask'][repoid] = etpConst['dumpstoragedir']+"/repo_"+repoid+"_"+etpConst['etpdatabasemaskfile']+".mtime"
@@ -10660,6 +10675,8 @@ class SystemSettings:
if os.path.isfile(sm_path) and os.access(sm_path,os.R_OK):
self.etpSettingFiles['repos_system_mask'][repoid] = sm_path
self.etpMtimeFiles['repos_system_mask'][repoid] = etpConst['dumpstoragedir']+"/repo_"+repoid+"_"+etpConst['etpdatabasesytemmaskfile']+".mtime"
if os.path.isfile(ct_path) and os.access(ct_path,os.R_OK):
self.etpSettingFiles['conflicting_tagged_packages'][repoid] = ct_path
# user defined package sets
sets_dir = etpConst['confsetsdir']
@@ -10670,9 +10687,7 @@ class SystemSettings:
set_file = str(set_file)
except (UnicodeDecodeError,UnicodeEncodeError,):
continue
set_filepath = os.path.join(sets_dir,set_file)
self.etpSettingFiles['system_package_sets'][set_file] = set_filepath
self.etpMtimeFiles['system_package_sets'][set_file] = etpConst['dumpstoragedir']+"/system_package_set_"+set_file+".mtime"
self.etpSettingFiles['system_package_sets'][set_file] = os.path.join(sets_dir,set_file)
data = {}
for item in self.etpSettingFiles:
@@ -10791,13 +10806,29 @@ class SystemSettings:
def system_dirs_mask_parser(self):
return self.__generic_parser(self.etpSettingFiles['system_dirs_mask'])
def conflicting_tagged_packages_parser(self):
data = {}
# keep priority order
repoids = [x for x in etpRepositoriesOrder if x in self.etpSettingFiles['conflicting_tagged_packages']]
for repoid in repoids:
filepath = self.etpSettingFiles['conflicting_tagged_packages'].get(repoid)
if os.path.isfile(filepath) and os.access(filepath,os.R_OK):
f = open(filepath,"r")
content = f.readlines()
f.close()
content = [x.strip().rsplit("#",1)[0].strip().split() for x in content if not x.startswith("#") and x.strip()]
for mydata in content:
if len(mydata) < 2: continue
data[mydata[0]] = mydata[1:]
return data
'''
internal functions
'''
def __generic_parser(self, filepath):
data = []
if os.path.isfile(filepath):
if os.path.isfile(filepath) and os.access(filepath,os.R_OK):
f = open(filepath,"r")
content = f.readlines()
f.close()
@@ -16717,6 +16748,11 @@ class ServerInterface(TextInterface):
repo = self.default_repository
return os.path.join(self.get_local_database_dir(repo, branch),etpConst['etpdatabasesytemmaskfile'])
def get_local_database_confl_tagged_file(self, repo = None, branch = None):
if repo == None:
repo = self.default_repository
return os.path.join(self.get_local_database_dir(repo, branch),etpConst['etpdatabaseconflictingtaggedfile'])
def get_local_database_licensewhitelist_file(self, repo = None, branch = None):
if repo == None:
repo = self.default_repository
@@ -28385,6 +28421,12 @@ class ServerMirrorsInterface:
if not download:
critical.append(data['database_package_system_mask_file'])
database_package_confl_tagged_file = self.Entropy.get_local_database_confl_tagged_file(repo)
if os.path.isfile(database_package_confl_tagged_file) or download:
data['database_package_confl_tagged_file'] = database_package_confl_tagged_file
if not download:
critical.append(data['database_package_confl_tagged_file'])
database_license_whitelist_file = self.Entropy.get_local_database_licensewhitelist_file(repo)
if os.path.isfile(database_license_whitelist_file) or download:
data['database_license_whitelist_file'] = database_license_whitelist_file

9
libraries/entropyConstants.py
View File

@@ -538,6 +538,7 @@ def const_defaultSettings(rootdir):
'entropyxpakdatarelativepath': "data", # Gentoo xpak metadata directory path
'entropyxpakfilename': "metadata.xpak", # Gentoo xpak metadata file name
'etpdatabaseconflictingtaggedfile': ETP_DBFILE+".conflicting_tagged", # file containing a list of packages that are strictly required by the repository, thus forced
'etpdatabasesytemmaskfile': ETP_DBFILE+".system_mask", # file containing a list of packages that are strictly required by the repository, thus forced
'etpdatabasemaskfile': ETP_DBFILE+".mask",
'etpdatabaseupdatefile': ETP_DBFILE+".repo_updates",
@@ -724,12 +725,6 @@ def const_defaultSettings(rootdir):
},
},
# packages whose need their other installs (different tag), to be removed
'conflicting_tagged_packages': {
'x11-drivers/nvidia-drivers': ['x11-drivers/nvidia-drivers'],
'x11-drivers/ati-drivers': ['x11-drivers/ati-drivers'],
},
'clientserverrepoid': "__system__",
'clientdbid': "client",
'serverdbid': "etpdb:",
@@ -1116,7 +1111,7 @@ def const_readEquoSettings():
elif line.startswith("configprotectskip|") and (len(line.split("|")) == 2):
configprotect = line.split("|")[1].strip()
for x in configprotect.split():
etpConst['configprotectskip'].append(etpConst['systemroot']+x)
etpConst['configprotectskip'].append(etpConst['systemroot']+unicode(x,'raw_unicode_escape'))
def const_setupEntropyPid(just_read = False):