[Python-checkins] python/dist/src/Mac/scripts buildpkg.py,1.2,1.3

[jvr@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv25082/Mac/scripts

Modified Files:
	buildpkg.py 
Log Message:
patch #678211 from Robin Dunn

Index: buildpkg.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/buildpkg.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildpkg.py	6 Sep 2002 21:55:13 -0000	1.2
--- buildpkg.py	1 Feb 2003 10:07:28 -0000	1.3
***************
*** 71,74 ****
--- 71,75 ----
  InstallOnly
  RequiresReboot
+ RootVolumeOnly
  InstallFat\
  """
***************
*** 148,151 ****
--- 149,153 ----
          'InstallOnly': 'NO',
          'RequiresReboot': 'NO',
+         'RootVolumeOnly' : 'NO',
          'InstallFat': 'NO'}
  
***************
*** 281,291 ****
  
          # find pre-process and post-process scripts
!         # naming convention: packageName.{pre,post}-{upgrade,install}
!         # Alternatively the filenames can be {pre,post}-{upgrade,install}
          # in which case we prepend the package name
          packageName = self.packageInfo["Title"]
!         for pat in ("*upgrade", "*install"):
              pattern = join(self.resourceFolder, packageName + pat)
              allFiles = allFiles + glob.glob(pattern)
  
          # check name patterns
--- 283,295 ----
  
          # find pre-process and post-process scripts
!         # naming convention: packageName.{pre,post}_{upgrade,install}
!         # Alternatively the filenames can be {pre,post}_{upgrade,install}
          # in which case we prepend the package name
          packageName = self.packageInfo["Title"]
!         for pat in ("*upgrade", "*install", "*flight"):
              pattern = join(self.resourceFolder, packageName + pat)
+             pattern2 = join(self.resourceFolder, pat)
              allFiles = allFiles + glob.glob(pattern)
+             allFiles = allFiles + glob.glob(pattern2)
  
          # check name patterns
***************
*** 297,309 ****
              if f[-6:] == ".lproj":
                  files.append((f, f))
!             elif f in ["pre-upgrade", "pre-install", "post-upgrade", "post-install"]:
!                 files.append((f, self.packageInfo["Title"]+"."+f))
!             elif f[-8:] == "-upgrade":
                  files.append((f,f))
!             elif f[-8:] == "-install":
                  files.append((f,f))
  
          # copy files
          for src, dst in files:
              f = join(self.resourceFolder, src)
              if isfile(f):
--- 301,317 ----
              if f[-6:] == ".lproj":
                  files.append((f, f))
!             elif basename(f) in ["pre_upgrade", "pre_install", "post_upgrade", "post_install"]:
!                 files.append((f, packageName+"."+basename(f)))
!             elif basename(f) in ["preflight", "postflight"]:
!                 files.append((f, f))
!             elif f[-8:] == "_upgrade":
                  files.append((f,f))
!             elif f[-8:] == "_install":
                  files.append((f,f))
  
          # copy files
          for src, dst in files:
+             src = basename(src)
+             dst = basename(dst)
              f = join(self.resourceFolder, src)
              if isfile(f):