Author: wade
Date: 2006-07-21 20:47:42 -0400 (Fri, 21 Jul 2006)
New Revision: 62888
Modified:
trunk/release/packaging/conf/suse-101-i586
trunk/release/packaging/conf/suse-101-x86_64
trunk/release/website/mk-distro-index.py
trunk/release/website/mk-repos.py
Log:
Use yum repository for zmd/suse10.1
Modified: trunk/release/packaging/conf/suse-101-i586
===================================================================
--- trunk/release/packaging/conf/suse-101-i586 2006-07-21 23:45:29 UTC (rev
62887)
+++ trunk/release/packaging/conf/suse-101-i586 2006-07-22 00:47:42 UTC (rev
62888)
@@ -4,5 +4,4 @@
# Repo conf
USE_ZMD=1
-USE_YAST=1
Modified: trunk/release/packaging/conf/suse-101-x86_64
===================================================================
--- trunk/release/packaging/conf/suse-101-x86_64 2006-07-21 23:45:29 UTC
(rev 62887)
+++ trunk/release/packaging/conf/suse-101-x86_64 2006-07-22 00:47:42 UTC
(rev 62888)
@@ -2,5 +2,4 @@
jaildir=/jails/suse-101-x86_64-root-0/jail/
chroot_path=/usr/bin/chroot
-USE_YAST=1
USE_ZMD=1
Modified: trunk/release/website/mk-distro-index.py
===================================================================
--- trunk/release/website/mk-distro-index.py 2006-07-21 23:45:29 UTC (rev
62887)
+++ trunk/release/website/mk-distro-index.py 2006-07-22 00:47:42 UTC (rev
62888)
@@ -39,7 +39,7 @@
vars[i] = env_obj.info[i]
# Generate OC text
- if env_obj.info.has_key('USE_OC') and env_obj.info['USE_OC']:
+ if utils.get_dict_var('USE_OC', env_obj):
return_text += """
<p>
This distro supports installing Mono using Novell's Red Carpet.
@@ -60,7 +60,7 @@
# Generate Yum Text
- if env_obj.info.has_key('USE_YUM') and env_obj.info['USE_YUM']:
+ if utils.get_dict_var('USE_YUM', env_obj):
return_text += """
<p>
This distro supports installing packages via <tt>yum</tt>.
Putting the
@@ -70,7 +70,7 @@
"""
# Generate yast text
- if env_obj.info.has_key('USE_YAST') and env_obj.info['USE_YAST']:
+ if utils.get_dict_var('USE_YAST', env_obj) or
utils.get_dict_var('USE_ZMD', env_obj):
return_text += """
<p>
This distro supports installing packages via <tt>YaST</tt>.
Add the following installation
@@ -86,7 +86,7 @@
# TODO: Generate zmd text
# Hmm... zmd can use all of the above sources...
- if env_obj.info.has_key('USE_ZMD') and env_obj.info['USE_ZMD']:
+ if utils.get_dict_var('USE_ZMD', env_obj):
pass
#Only select one category, since they're all valid.
Modified: trunk/release/website/mk-repos.py
===================================================================
--- trunk/release/website/mk-repos.py 2006-07-21 23:45:29 UTC (rev 62887)
+++ trunk/release/website/mk-repos.py 2006-07-22 00:47:42 UTC (rev 62888)
@@ -103,7 +103,7 @@
# Start creating repositories
- if distro_obj.info.has_key('USE_OC') and
distro_obj.info['USE_OC']:
+ if utils.get_dict_var('USE_OC', distro_obj.info):
if distro_obj.info.has_key('distro_aliases'):
DISTRO_STRING = ":".join([distro_obj.name] +
distro_obj.info['distro_aliases'])
else:
@@ -111,22 +111,24 @@
utils.append_text_to_files( {'channel.conf': 'AddDistro
%s %s\n' % (DISTRO_STRING, distro_obj.name) } )
- if distro_obj.info.has_key('USE_YUM') and
distro_obj.info['USE_YUM']:
+ if utils.get_dict_var('USE_YUM', distro_obj.info) or
utils.get_dict_var('USE_ZMD', distro_obj.info):
os.system("createrepo " + distro_obj.name)
- shutil.copy(config.release_repo_root + os.sep +
'website/repo-config/yum/mono.repo', distro_obj.name)
- utils.substitute_parameters_in_file(distro_obj.name +
os.sep + 'mono.repo', {
- '@DISTRO@': distro_obj.name,
- '@URL_PREFIX@': url_prefix,
- '@BUNDLE_NAME@':
bundle_conf.info['bundle_urlname'],
- } )
+ if utils.get_dict_var('USE_YUM', distro_obj.info):
+ shutil.copy(config.release_repo_root + os.sep +
'website/repo-config/yum/mono.repo', distro_obj.name)
+
utils.substitute_parameters_in_file(distro_obj.name + os.sep + 'mono.repo', {
+ '@DISTRO@': distro_obj.name,
+ '@URL_PREFIX@': url_prefix,
+ '@BUNDLE_NAME@':
bundle_conf.info['bundle_urlname'],
+ } )
+
# Instructions about how to create a yast repo:
#http://en.opensuse.org/SDB%3AGenerating_YaST_Installation_Sources
# Plain cache generated with genIS_PLAINcache in
yast2-packagemanager package (also liby2util)
# REAL yast repo created with create_package_descr in
autoyast2-utils package
- if distro_obj.info.has_key('USE_YAST') and
distro_obj.info['USE_YAST']:
+ if utils.get_dict_var('USE_YAST', distro_obj.info):
# The PLAINcache file is not cross platform... try a
'real' yast source
#os.system("cd %s;
/home/wberrier/yast_install/bin/genIS_PLAINcache -f -r .; gzip IS_PLAINcache ;
cd - " % i)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
