← Back to branch summary

~gary-lasker/software-center/fix-crash-lp968988

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Kiwinote
  • Date: 2012-03-15 22:36:31 UTC
  • mfrom: (2867 trunk)
  • mto: This revision was merged to the branch mainline in revision 2881.
  • Revision ID: kiwinote@gmail.com-20120315223631-lvea6t5sydpkkqni
merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
51
51
                        gtkbuilder, flags=re.DOTALL)
52
52
    open(fname, "w").write(gtkbuilder)
53
53
 
 
54
 
54
55
def merge_extras_ubuntu_com_channel_file():
55
56
    # update ubuntu-extras.list.in (this will not be part of debian as
56
57
    # its killed of in debian/rules on a non-ubuntu build)
57
58
    DISTROSERIES = platform.dist()[2]
58
59
    channelfile = "data/channels/Ubuntu/ubuntu-extras.list"
59
 
    s=open(channelfile+".in").read()
 
60
    s = open(channelfile + ".in").read()
60
61
    open(channelfile, "w").write(s.replace("#DISTROSERIES#", DISTROSERIES))
61
 
    
 
62
 
62
63
 
63
64
# update version.py
64
65
line = open("debian/changelog").readline()
147
148
                   ['debian/source_software-center.py']),
148
149
                  # extra software channels (can be distro specific)
149
150
                  ('/usr/share/app-install/channels/',
150
 
                   glob.glob("data/channels/%s/*" % DISTRO) ),
 
151
                   glob.glob("data/channels/%s/*" % DISTRO)),
151
152
                  ],
152
153
      cmdclass={"build": build_extra.build_extra,
153
154
                "build_i18n": build_i18n.build_i18n,