Merge lp:~al-maisan/bzr-builddeb/uri-redirect into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello there!

This branch fixes a

    - few instances of files being opened w/o checking for URI redirections
    - a minor glitch when dsc locations are to be read from a file
      (bzr import-dsc --file ..)

[James Westby (james-w)]

Looks good, Thanks.

James

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2009-09-14 19:04:02 +0000
+++ cmds.py	2009-09-16 12:47:18 +0000
@@ -45,7 +45,6 @@
 from bzrlib.option import Option
 from bzrlib.revisionspec import RevisionSpec
 from bzrlib.trace import info, warning
-from bzrlib.transport import get_transport
 from bzrlib.workingtree import WorkingTree
 
 from bzrlib.plugins.builddeb import (
@@ -68,7 +67,6 @@
         DistributionBranchSet,
         DscCache,
         DscComp,
-        open_file_via_transport,
         )
 from bzrlib.plugins.builddeb.merge_package import fix_ancestry_as_needed
 from bzrlib.plugins.builddeb.source_distiller import (
@@ -81,13 +79,16 @@
         UpstreamBranchSource,
         get_upstream_sources,
         )
-from bzrlib.plugins.builddeb.util import (find_changelog,
+from bzrlib.plugins.builddeb.util import (
+        dget_changes,
+        find_changelog,
+        find_last_distribution,
         get_export_upstream_revision,
-        find_last_distribution,
         lookup_distribution,
+        open_file,
+        open_file_via_transport,
         suite_to_distribution,
         tarball_name,
-        dget_changes,
         )
 
 dont_purge_opt = Option('dont-purge',
@@ -652,8 +653,7 @@
     takes_args = ['files*']
 
     filename_opt = Option('file', help="File containing URIs of source "
-                          "packages to import.", type=str, argname="filename",
-                          short_name='F')
+                          "packages to import.", type=str, short_name='F')
 
     takes_options = [filename_opt]
 
@@ -680,7 +680,7 @@
                 get_dsc_part(from_transport, name)
             db.import_package(os.path.join(orig_target, filename))
 
-    def run(self, files_list, filename=None):
+    def run(self, files_list, file=None):
         from bzrlib.plugins.builddeb.errors import MissingChangelogError
         try:
             tree = WorkingTree.open_containing('.')[0]
@@ -694,14 +694,14 @@
                         "command")
             if files_list is None:
                 files_list = []
-            if filename is not None:
-                if isinstance(filename, unicode):
-                    filename = filename.encode('utf-8')
-                base_dir, path = urlutils.split(filename)
-                sources_file = get_transport(base_dir).get(path)
+            if file is not None:
+                if isinstance(file, unicode):
+                    file = file.encode('utf-8')
+                sources_file = open_file(file)
                 for line in sources_file:
-                    line.strip()
-                    files_list.append(line)
+                    line = line.strip()
+                    if len(line) > 0:
+                        files_list.append(line)
             if len(files_list) < 1:
                 raise BzrCommandError("You must give the location of at least one "
                                       "source package to install, or use the "

=== modified file 'import_dsc.py'
--- import_dsc.py	2009-09-14 19:04:02 +0000
+++ import_dsc.py	2009-09-16 12:26:09 +0000
@@ -62,7 +62,6 @@
 from bzrlib.trace import warning, info, mutter
 from bzrlib.transform import TreeTransform, cook_conflicts, resolve_conflicts
 from bzrlib.transport import (
-    do_catching_redirections,
     get_transport,
     )
 
@@ -77,7 +76,10 @@
                 UpstreamAlreadyImported,
                 UpstreamBranchAlreadyMerged,
                 )
-from bzrlib.plugins.builddeb.util import get_commit_info_from_changelog, get_snapshot_revision
+from bzrlib.plugins.builddeb.util import (
+    get_commit_info_from_changelog, get_snapshot_revision, open_transport,
+    open_file_via_transport
+    )
 
 
 files_to_ignore = set(['.cvsignore', '.arch-inventory', '.bzrignore',
@@ -295,26 +297,6 @@
     tt.apply()
 
 
-def open_transport(path):
-  """Obtain an appropriate transport instance for the given path."""
-  base_dir, path = urlutils.split(path)
-  transport = get_transport(base_dir)
-  return (path, transport)
-
-
-def open_file_via_transport(filename, transport):
-  """Open a file using the transport, follow redirects as necessary."""
-  def open_file(transport):
-    return transport.get(filename)
-  def follow_redirection(transport, e, redirection_notice):
-    mutter(redirection_notice)
-    _filename, redirected_transport = open_transport(e.target)
-    return redirected_transport
-
-  result = do_catching_redirections(open_file, transport, follow_redirection)
-  return result
-
-
 class DscCache(object):
 
   def __init__(self, transport=None):

=== modified file 'repack_tarball.py'
--- repack_tarball.py	2009-03-08 23:28:22 +0000
+++ repack_tarball.py	2009-09-16 12:47:18 +0000
@@ -42,6 +42,7 @@
 from bzrlib import urlutils
 
 from bzrlib.plugins.builddeb.errors import UnsupportedRepackFormat
+from bzrlib.plugins.builddeb.util import open_file, open_file_via_transport
 
 
 class TgzRepacker(object):
@@ -138,21 +139,15 @@
     return None
 
 
-def _get_file_from_location(location):
-    base_dir, path = urlutils.split(location)
-    transport = get_transport(base_dir)
-    return transport.get(path)
-
-
 def _error_if_exists(target_transport, new_name, source_name):
     if not source_name.endswith('.tar.gz'):
         raise FileExists(new_name)
-    source_f = _get_file_from_location(source_name)
+    source_f = open_file(source_name)
     try:
         source_sha = new_sha(source_f.read()).hexdigest()
     finally:
         source_f.close()
-    target_f = target_transport.get(new_name)
+    target_f = open_file_via_transport(new_name, target_transport)
     try:
         target_sha = new_sha(target_f.read()).hexdigest()
     finally:
@@ -181,7 +176,7 @@
     target_transport.ensure_base()
     target_f = target_transport.open_write_stream(new_name)
     try:
-        source_f = _get_file_from_location(source_name)
+        source_f = open_file(source_name)
         try:
             repacker = repacker_cls(source_f)
             repacker.repack(target_f)

=== modified file 'util.py'
--- util.py	2009-07-15 18:17:12 +0000
+++ util.py	2009-09-16 12:26:09 +0000
@@ -37,7 +37,9 @@
         errors,
         urlutils,
         )
-from bzrlib.transport import get_transport
+from bzrlib.transport import (
+    do_catching_redirections, get_transport
+    )
 from bzrlib.plugins.builddeb.errors import (
                 MissingChangelogError,
                 AddChangelogError,
@@ -288,12 +290,36 @@
         f_f.close()
 
 
+def open_file(path):
+    filename, transport = open_transport(path)
+    return open_file_via_transport(filename, transport)
+
+
+def open_transport(path):
+  """Obtain an appropriate transport instance for the given path."""
+  base_dir, path = urlutils.split(path)
+  transport = get_transport(base_dir)
+  return (path, transport)
+
+
+def open_file_via_transport(filename, transport):
+  """Open a file using the transport, follow redirects as necessary."""
+  def open_file(transport):
+    return transport.get(filename)
+  def follow_redirection(transport, e, redirection_notice):
+    mutter(redirection_notice)
+    _filename, redirected_transport = open_transport(e.target)
+    return redirected_transport
+
+  result = do_catching_redirections(open_file, transport, follow_redirection)
+  return result
+
+
 def _dget(cls, dsc_location, target_dir):
     if not os.path.isdir(target_dir):
         raise errors.NotADirectory(target_dir)
-    base_dir, path = urlutils.split(dsc_location)
-    dsc_t = get_transport(base_dir)
-    dsc_contents = dsc_t.get_bytes(path)
+    path, dsc_t = open_transport(dsc_location)
+    dsc_contents = open_file_via_transport(path, dsc_t).read()
     dsc = cls(dsc_contents)
     for file_details in dsc['files']:
         name = file_details['name']