diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 386: Renamed fetch image tools in line with other applications in the linaro-image-tools repository.

Message ID 20110722223818.5087.76673.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

James Tunnicliffe July 22, 2011, 10:38 p.m. UTC 
Merge authors:
  James Tunnicliffe (dooferlad)
Related merge proposals:
  https://code.launchpad.net/~dooferlad/linaro-image-tools/fetch_image_rename/+merge/68911
  proposed by: James Tunnicliffe (dooferlad)
  review: Approve - James Westby (james-w)
------------------------------------------------------------
revno: 386 [merge]
committer: James Tunnicliffe <james.tunnicliffe@linaro.org>
branch nick: linaro-image-tools
timestamp: Fri 2011-07-22 23:34:24 +0100
message:
  Renamed fetch image tools in line with other applications in the linaro-image-tools repository.
renamed:
  fetch_image.py => linaro-fetch-image
  fetch_image_ui.py => linaro-fetch-image-ui
  linaro_image_tools/FetchImage.py => linaro_image_tools/fetch_image.py
modified:
  linaro-fetch-image
  linaro-fetch-image-ui


--
lp:linaro-image-tools
https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk

You are subscribed to branch lp:linaro-image-tools.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription
diff mbox

Patch

=== renamed file 'fetch_image.py' => 'linaro-fetch-image'
--- fetch_image.py	2011-06-17 13:10:22 +0000
+++ linaro-fetch-image	2011-07-22 21:09:29 +0000
@@ -22,13 +22,13 @@ 
 
 import sys
 import os
-import linaro_image_tools.FetchImage as FetchImage
+import linaro_image_tools.fetch_image as fetch_image
 import logging
 
 
 def main():
-    file_handler = FetchImage.FileHandler()
-    config = FetchImage.FetchImageConfig()
+    file_handler = fetch_image.FileHandler()
+    config = fetch_image.FetchImageConfig()
 
     # Unfortunately we need to do a bit of a hack here and look for some
     # options before performing a full options parse.
@@ -59,7 +59,7 @@ 
 
     # Using the config we have, look up URLs to download data from in the
     # server index
-    db = FetchImage.DB(file_handler.index_file)
+    db = fetch_image.DB(file_handler.index_file)
 
     image_url, hwpack_url = db.get_image_and_hwpack_urls(config.args)
 

=== renamed file 'fetch_image_ui.py' => 'linaro-fetch-image-ui'
--- fetch_image_ui.py	2011-07-22 16:42:58 +0000
+++ linaro-fetch-image-ui	2011-07-22 21:09:29 +0000
@@ -26,7 +26,7 @@ 
 import sys
 import re
 import os
-import linaro_image_tools.FetchImage as FetchImage
+import linaro_image_tools.fetch_image as fetch_image
 import string
 import operator
 import Queue
@@ -1202,7 +1202,7 @@ 
 
         if(image_url and hwpack_url):
 
-            self.file_handler = FetchImage.FileHandler()
+            self.file_handler = fetch_image.FileHandler()
 
             self.timer = wx.Timer(self)
             self.Bind(wx.EVT_TIMER, self.timer_ping, self.timer)
@@ -1469,8 +1469,8 @@ 
             self.wizard.FindWindowById(wx.ID_FORWARD).Enable()
 
     def go(self):
-        file_handler = FetchImage.FileHandler()
-        self.config = FetchImage.FetchImageConfig()
+        file_handler = fetch_image.FileHandler()
+        self.config = fetch_image.FetchImageConfig()
         self.config.settings["force_download"] = False
         self.config.settings['compatable_hwpacks'] = ['foo']
 
@@ -1483,7 +1483,7 @@ 
 
         # Using the config we have, look up URLs to download data from in
         # the server index
-        db = FetchImage.DB(file_handler.index_file)
+        db = fetch_image.DB(file_handler.index_file)
 
         # Create the wizard and the pages
         self.wizard = wiz.Wizard(self, -1, "Linaro Media Builder")

=== renamed file 'linaro_image_tools/FetchImage.py' => 'linaro_image_tools/fetch_image.py'