← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to release/scripts/modules/sys_info.py

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
release/scripts/modules/sys_info.py
27
27
 
28
28
 
29
29
def cutPoint(text, length):
30
 
    "Returns position of the last space found before 'length' chars"
 
30
    """Returns position of the last space found before 'length' chars"""
31
31
    l = length
32
32
    c = text[l]
33
33
    while c != ' ':
87
87
    output.write("\nDirectories:\n")
88
88
    output.write(lilies)
89
89
    output.write("scripts: %r\n" % (bpy.utils.script_paths()))
90
 
    output.write("user scripts: %r\n" % (bpy.utils.user_script_path()))
 
90
    output.write("user scripts: %r\n" % (bpy.utils.script_path_user()))
 
91
    output.write("pref scripts: %r\n" % (bpy.utils.script_path_pref()))
91
92
    output.write("datafiles: %r\n" % (bpy.utils.user_resource('DATAFILES')))
92
93
    output.write("config: %r\n" % (bpy.utils.user_resource('CONFIG')))
93
94
    output.write("scripts : %r\n" % (bpy.utils.user_resource('SCRIPTS')))
98
99
    output.write(lilies)
99
100
    ffmpeg = bpy.app.ffmpeg
100
101
    if ffmpeg.supported:
101
 
        for lib in ['avcodec', 'avdevice', 'avformat', 'avutil', 'swscale']:
 
102
        for lib in ("avcodec", "avdevice", "avformat", "avutil", "swscale"):
102
103
            output.write("%r:%r%r\n" % (lib, " " * (10 - len(lib)),
103
104
                         getattr(ffmpeg, lib + "_version_string")))
104
105
    else: