[Uludag-commits] r11887 - trunk/pisi/pisi

[svn-uludag at uludag.org.tr]

Author: caglar
Date: Thu Jan  4 20:58:20 2007
New Revision: 11887

Modified:
   trunk/pisi/pisi/util.py
Log:
Strip only if its not a link..

DEBUG: /usr/i686-pc-linux-gnu/binutils-bin/2.17.50.0.9/ld [stripped]
Sistem Hatası: Program Sonlandırıldı.
exceptions.IOError: [Errno 2] Böyle bir dosya ya da dizin yok: '/var/pisi/binutils-2.17.50.0.9-7/install/usr/i686-pc-linux-gnu/lib/libbfd.la'
Genel yardım için lütfen 'pisi help' komutunu kullanınız.
Geri-iz:
  File "/usr/bin/pisi", line 89, in ?
    cli.run_command()
  File "/usr/lib/pardus/pisi/cli/pisicli.py", line 111, in run_command
    self.command.run()
  File "/usr/lib/pardus/pisi/cli/commands.py", line 491, in run
    pisi.api.build_until(x, ctx.get_option('until'))
  File "/usr/lib/pardus/pisi/build.py", line 992, in build_until
    __buildState_buildpackages(pb, last)
  File "/usr/lib/pardus/pisi/build.py", line 956, in __buildState_buildpackages
    pb.build_packages()
  File "/usr/lib/pardus/pisi/build.py", line 740, in build_packages
    self.strip_install_dir()
  File "/usr/lib/pardus/pisi/build.py", line 556, in strip_install_dir
    util.strip_directory(install_dir)
  File "/usr/lib/pardus/pisi/util.py", line 509, in strip_directory
    ladata = file(frpath).read()
DEBUG: PiSi API finalized



Modified: trunk/pisi/pisi/util.py
=================================================================
--- trunk/pisi/pisi/util.py	(original)
+++ trunk/pisi/pisi/util.py	Thu Jan  4 20:58:20 2007
@@ -505,7 +505,7 @@
             # entries sometimes triggers compile-time errors or linkage problems.
             # Instead of patching all these buggy sources and maintain these patches,
             # PiSi removes wrong paths...
-            if frpath.endswith(".la"):
+            if frpath.endswith(".la") and not os.path.islink(frpath):
                 ladata = file(frpath).read()
                 new_ladata = re.sub("-L%s/\S*" % ctx.config.tmp_dir(), "", ladata)
                 new_ladata = re.sub("%s/\S*/install/" % ctx.config.tmp_dir(), "/", new_ladata)