[Morphix-cvs] ibuild/share/patches/PrepareRelease control.py,1.10,1.11

[Jure C. <gan...@us...>]

Update of /cvsroot/morphix/ibuild/share/patches/PrepareRelease
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11582

Modified Files:
	control.py 
Log Message:
PrepareRelease now supports iso files


Index: control.py
===================================================================
RCS file: /cvsroot/morphix/ibuild/share/patches/PrepareRelease/control.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** control.py	2 Apr 2005 17:57:16 -0000	1.10
--- control.py	2 Jun 2005 21:51:25 -0000	1.11
***************
*** 13,17 ****
  
  versions = {'Morphix 0.4' : ['0.4-1e', '0.4-1d', '0.4-1c'],
!             'Morphix 0.5' : ['0.5-pre5','0.5-pre4', '0.5-pre3', '0.5-pre2', '0.5-pre1']}
  
  if getsetting('base') == "autodetect":
--- 13,17 ----
  
  versions = {'Morphix 0.4' : ['0.4-1e', '0.4-1d', '0.4-1c'],
!             'Morphix 0.5' : ['0.5-pre5','0.5-pre4', '0.5-pre3', '0.5-pre2', '0.5-pre1','MorphixBase-0.5-pre5.iso', 'MorphixBase-0.5-pre4.iso','MorphixBase-0.5-pre3.iso','MorphixBase-0.5-pre2.iso', 'MorphixBase-0.5-pre1.iso']}
  
  if getsetting('base') == "autodetect":
***************
*** 27,32 ****
     base = getsetting('base')
  
! log.info('Selected %s base' % base)                        
! fs.cp(fs.path.join(si,'base',base),release)
  
  if getsetting('cleanbase') == 'yes':
--- 27,45 ----
     base = getsetting('base')
  
! log.info('Selected %s base' % base)
! #FIXME (use fs.path.isfile)
! b = fs.path.join(si, 'base', base)
! if os.path.isfile(fs.path.join(si,'base',base):
!         fs.mkdir(fs.path.join(basepath,'tmpmnt'),force=True)
!         cmd = []
!         cmd += ['sudo mount -o loop '+ b + ' '+ fs.path.join(basepath,'tmpmnt')]
!         cmd += ['sudo mkdir -p ' + source]
!         cmd += ['sudo cp -Rp ' + fs.path.join(basepath,'tmpmnt',"*") + ' ' + fs.path.join(release,'.') ]
!         cmd += ['sudo umount '+ fs.path.join(basepath,'tmpmnt')]
!         for i in cmd:
!             shell.execute(i)
!         fs.rmrf(fs.path.join(basepath,'tmpmnt'))
! elif:        
!         fs.cp(fs.path.join(si,'base',base),release)
  
  if getsetting('cleanbase') == 'yes':