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

[entropy.server] add nonfree repository metadata to repositories dict

Browse Source
This commit is contained in:
Fabio Erculiani
2010-01-27 10:10:55 +01:00
parent a78148bfad
commit be46cca688
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/entropy/server/interfaces/main.py
+27 -2
View File
@@ -624,7 +624,14 @@ class ServerSystemSettingsPlugin(SystemSettingsPlugin):
os.path.join( etpConst['entropyworkdir'],
"server",
repoid,
"packages",
etpConst['packagesrelativepath_basedir'],
etpSys['arch']
)
data['repositories'][repoid]['packages_dir_nonfree'] = \
os.path.join( etpConst['entropyworkdir'],
"server",
repoid,
etpConst['packagesrelativepath_basedir_nonfree'],
etpSys['arch']
)
data['repositories'][repoid]['store_dir'] = \
@@ -651,7 +658,13 @@ class ServerSystemSettingsPlugin(SystemSettingsPlugin):
data['repositories'][repoid]['packages_relative_path'] = \
os.path.join( sys_set['repositories']['product'],
repoid,
"packages",
etpConst['packagesrelativepath_basedir'],
etpSys['arch']
)+"/"
data['repositories'][repoid]['packages_relative_path_nonfree'] = \
os.path.join( sys_set['repositories']['product'],
repoid,
etpConst['packagesrelativepath_basedir_nonfree'],
etpSys['arch']
)+"/"
data['repositories'][repoid]['database_relative_path'] = \
@@ -748,6 +761,12 @@ class ServerSettingsMixin:
repo = self.default_repository
return srv_set['repositories'][repo]['packages_relative_path']
def _get_remote_packages_nonfree_relative_path(self, repo = None):
srv_set = self.SystemSettings[self.sys_settings_plugin_id]['server']
if repo is None:
repo = self.default_repository
return srv_set['repositories'][repo]['packages_relative_path_nonfree']
def _get_remote_database_relative_path(self, repo = None):
srv_set = self.SystemSettings[self.sys_settings_plugin_id]['server']
if repo is None:
@@ -778,6 +797,12 @@ class ServerSettingsMixin:
repo = self.default_repository
return srv_set['repositories'][repo]['packages_dir']
def _get_local_packages_nonfree_directory(self, repo = None):
srv_set = self.SystemSettings[self.sys_settings_plugin_id]['server']
if repo is None:
repo = self.default_repository
return srv_set['repositories'][repo]['packages_dir_nonfree']
def _get_local_database_taint_file(self, repo = None, branch = None):
if repo is None:
repo = self.default_repository