Attachment 2943 Details for Bug 7794 – Here's a patch to test

[patch] Here's a patch to test

swift.patch (text/plain), 1.07 KB, created by Kristoffer Grundström on 2012-10-15 03:09:00 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Kristoffer Grundström

Created: 2012-10-15 03:09:00 CEST

Size: 1.07 KB

patch

obsolete

>diff -rcN pkg/usr/share/tribler/Tribler/Main/tribler.py pkg-f/usr/share/tribler/Tribler/Main/tribler.py
>*** pkg/usr/share/tribler/Tribler/Main/tribler.py	2012-08-03 10:24:26.000000000 -0400
>--- pkg-f/usr/share/tribler/Tribler/Main/tribler.py	2012-08-18 21:08:55.012180457 -0400
>***************
>*** 414,420 ****
>          print >> sys.stderr, "Tribler is using",  self.sconfig.get_install_dir(), "as working directory"
>  
>          # Arno, 2012-05-21: Swift part II
>!         swiftbinpath = os.path.join(self.sconfig.get_install_dir(),"swift")
>          if sys.platform == "darwin":
>              if not os.path.exists(swiftbinpath):
>                  swiftbinpath = os.path.join(os.getcwdu(),"..","MacOS","swift")
>--- 414,420 ----
>          print >> sys.stderr, "Tribler is using",  self.sconfig.get_install_dir(), "as working directory"
>  
>          # Arno, 2012-05-21: Swift part II
>!         swiftbinpath = "/usr/bin/swift"
>          if sys.platform == "darwin":
>              if not os.path.exists(swiftbinpath):
>                  swiftbinpath = os.path.join(os.getcwdu(),"..","MacOS","swift")

diff -rcN pkg/usr/share/tribler/Tribler/Main/tribler.py pkg-f/usr/share/tribler/Tribler/Main/tribler.py
*** pkg/usr/share/tribler/Tribler/Main/tribler.py	2012-08-03 10:24:26.000000000 -0400
--- pkg-f/usr/share/tribler/Tribler/Main/tribler.py	2012-08-18 21:08:55.012180457 -0400
***************
*** 414,420 ****
          print >> sys.stderr, "Tribler is using",  self.sconfig.get_install_dir(), "as working directory"
  
          # Arno, 2012-05-21: Swift part II
!         swiftbinpath = os.path.join(self.sconfig.get_install_dir(),"swift")
          if sys.platform == "darwin":
              if not os.path.exists(swiftbinpath):
                  swiftbinpath = os.path.join(os.getcwdu(),"..","MacOS","swift")
--- 414,420 ----
          print >> sys.stderr, "Tribler is using",  self.sconfig.get_install_dir(), "as working directory"
  
          # Arno, 2012-05-21: Swift part II
!         swiftbinpath = "/usr/bin/swift"
          if sys.platform == "darwin":
              if not os.path.exists(swiftbinpath):
                  swiftbinpath = os.path.join(os.getcwdu(),"..","MacOS","swift")

Actions: View | Diff

Attachments on bug 7794: 2943