[pywin32-checkins] pywin32 setup.py,1.72,1.73

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14909

Modified Files:
	setup.py 
Log Message:
* Enable UAC control now py 2.6 trunk has the support.
* Don't run the post-install script if 'install' is to a temp dir.


Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** setup.py	24 May 2008 07:20:58 -0000	1.72
--- setup.py	28 May 2008 05:09:17 -0000	1.73
***************
*** 1115,1119 ****
          # XXX - hmm - a closer look at distutils shows it only uses win32api
          # if _winreg fails - and this never should.  Need to revisit this!
!         if not self.dry_run and not self.skip_build:
              # What executable to use?  This one I guess.
              filename = os.path.join(os.path.dirname(this_file), "pywin32_postinstall.py")
--- 1115,1123 ----
          # XXX - hmm - a closer look at distutils shows it only uses win32api
          # if _winreg fails - and this never should.  Need to revisit this!
!         # If self.root has a value, it means we are being "installed" into
!         # some other directory than Python itself (eg, into a temp directory
!         # for bdist_wininst to use) - in which case we must *not* run our
!         # installer
!         if not self.dry_run and not self.skip_build and not self.root:
              # What executable to use?  This one I guess.
              filename = os.path.join(os.path.dirname(this_file), "pywin32_postinstall.py")
***************
*** 1821,1825 ****
                      {"install_script": "pywin32_postinstall.py",
                       "title": "pywin32-%s" % (build_id,),
! #                     "user_access_control": "auto",
                      },
                   "bdist_msi":
--- 1825,1829 ----
                      {"install_script": "pywin32_postinstall.py",
                       "title": "pywin32-%s" % (build_id,),
!                      "user_access_control": "auto",
                      },
                   "bdist_msi":