Code review comment for lp:~mblayman/entertainer/packaging-fixes

=== removed directory 'cfg/data'
=== modified file 'entertainerlib/utils/configuration.py'
--- entertainerlib/utils/configuration.py 2008-09-17 18:27:37 +0000
+++ entertainerlib/utils/configuration.py 2008-10-25 13:12:21 +0000
@@ -16,9 +16,11 @@

 from entertainerlib.utils.theme import Theme

-SOURCE_CONFIG = os.path.abspath(
- os.path.dirname(__file__) + '/../../cfg'
- )
+SOURCE_CONFIG = {
+ 'branch' : os.path.abspath(os.path.dirname(__file__) + '/../../cfg'),
+ # Hardcoded path for a package install
+ 'package' : "/usr/share/entertainer/cfg"
+ }

 class Configuration(MessageHandler):
     """
@@ -97,7 +99,15 @@
         '''
         config_dir = self.get_cfg_dir()
         try:
- shutil.copytree(SOURCE_CONFIG, config_dir)
+ # Copy configuration data from a dev branch if we can
+ if os.path.exists(SOURCE_CONFIG['branch']):
+ shutil.copytree(SOURCE_CONFIG['branch'], config_dir)
+ # Install configuration data from the hardcoded package path
+ elif os.path.exists(SOURCE_CONFIG['package']):
+ shutil.copytree(SOURCE_CONFIG['package'], config_dir)
+ else:
+ print "Couldn't find configuration data. Execution aborted."
+ sys.exit(1)
         except OSError:
             print "Couldn't copy configuration data to %s. Execution aborted." \
                 % config_dir

=== renamed directory 'cfg/data/icons' => 'icons'
=== added directory 'icons/hicolor'
=== added directory 'icons/hicolor/16x16'
=== added file 'icons/hicolor/16x16/entertainer.png'
Binary files icons/hicolor/16x16/entertainer.png 1970-01-01 00:00:00 +0000 and icons/hicolor/16x16/entertainer.png 2008-10-25 13:12:22 +0000 differ
=== renamed directory 'cfg/data/icons/24x24' => 'icons/hicolor/24x24'
=== added directory 'icons/hicolor/48x48'
=== added file 'icons/hicolor/48x48/entertainer.png'
Binary files icons/hicolor/48x48/entertainer.png 1970-01-01 00:00:00 +0000 and icons/hicolor/48x48/entertainer.png 2008-10-25 13:12:21 +0000 differ
=== renamed directory 'cfg/data/icons/scalable' => 'icons/hicolor/scalable'
=== modified file 'icons/hicolor/scalable/entertainer.svg'
--- cfg/data/icons/scalable/entertainer.svg 2008-06-06 22:54:48 +0000
+++ icons/hicolor/scalable/entertainer.svg 2008-10-25 13:12:22 +0000
@@ -15,11 +15,11 @@
    sodipodi:version="0.32"
    inkscape:version="0.46"
    version="1.0"
- sodipodi:docname="entertainer_icon.svg"
+ sodipodi:docname="entertainer.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-filename="/home/matt/Desktop/magicianhat.png"
- inkscape:export-xdpi="11.675675"
- inkscape:export-ydpi="11.675675"
+ inkscape:export-filename="/home/matt/repo/config-package-fix/icons/hicolor/48x48/entertainer.png"
+ inkscape:export-xdpi="23.549999"
+ inkscape:export-ydpi="23.549999"
    style="display:inline">
   <defs
      id="defs4">
@@ -75,13 +75,6 @@
          offset="1"
          id="stop3308" />
     </linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective10" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3304"
@@ -116,28 +109,6 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
- xlink:href="#linearGradient3304"
- id="linearGradient3498"
- gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- x1="30.755842"
- y1="123.12816"
- x2="149.2892"
- y2="123.12816"
- gradientTransform="translate(-200.26179,-44.443863)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3304"
- id="linearGradient3525"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-200.26179,-44.443863)"
- spreadMethod="pad"
- x1="30.755842"
- y1="123.12816"
- x2="149.2892"
- y2="123.12816" />
- <linearGradient
- inkscape:collect="always"
        xlink:href="#linearGradient3546"
        id="linearGradient3552"
        x1="-48.08326"
@@ -175,16 +146,16 @@
      objecttolerance="10"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="63.424403"
+ inkscape:zoom="3.6324324"
+ inkscape:cx="92.5"
      inkscape:cy="92.5"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      width="49px"
      inkscape:window-width="1279"
- inkscape:window-height="949"
- inkscape:window-x="1"
+ inkscape:window-height="900"
+ inkscape:window-x="5"
      inkscape:window-y="49" />
   <metadata
      id="metadata7">

=== modified file 'setup.py'
--- setup.py 2008-10-13 06:03:59 +0000
+++ setup.py 2008-10-25 13:12:21 +0000
@@ -6,7 +6,7 @@
 import os

-def find_files(dirs):
+def find_files(dirs, dest_root='share'):
     '''Walk files and directories and return them in a form for data_files'''
     # pylint: disable-msg=W0621
     result = []
@@ -14,7 +14,7 @@
         dirs = [dirs]
     for dir in dirs:
         for root, dirs, files in os.walk(dir):
- dest = os.path.join('share/entertainer', root)
+ dest = os.path.join(dest_root, root)
             source_files = [os.path.join(root, file) for file in files]
             result.append((dest, source_files))
     return result
@@ -32,7 +32,8 @@
     'entertainerlib/utils/glade/*',
     ]

-data_files = find_files(['cfg', 'translations'])
+data_files = find_files(['cfg', 'translations'], 'share/entertainer')
+data_files.extend(find_files('icons'))
 data_files.append(
     ('share/entertainer/docs', [
         'docs/LICENSE',