[Python-apps-commits] r10995 - in packages/awscli/trunk/debian (2 files)

[takaki at users.alioth.debian.org]

    Date: Sunday, June 22, 2014 @ 14:50:44
  Author: takaki
Revision: 10995

refresh a patch

Modified:
  packages/awscli/trunk/debian/changelog
  packages/awscli/trunk/debian/patches/adopt_to_botocore_changes

Modified: packages/awscli/trunk/debian/changelog
===================================================================
--- packages/awscli/trunk/debian/changelog	2014-06-22 14:42:19 UTC (rev 10994)
+++ packages/awscli/trunk/debian/changelog	2014-06-22 14:50:44 UTC (rev 10995)
@@ -1,6 +1,8 @@
 awscli (1.3.18-1) UNRELEASED; urgency=medium
 
   * New upstream release (Closes: #744890)
+    + Fix "Unconditionally crashes at startup" (Closes: #751264)
+  * debian/patches: Refresh.
 
  -- TANIGUCHI Takaki <takaki at debian.org>  Sun, 22 Jun 2014 23:41:19 +0900
 

Modified: packages/awscli/trunk/debian/patches/adopt_to_botocore_changes
===================================================================
--- packages/awscli/trunk/debian/patches/adopt_to_botocore_changes	2014-06-22 14:42:19 UTC (rev 10994)
+++ packages/awscli/trunk/debian/patches/adopt_to_botocore_changes	2014-06-22 14:50:44 UTC (rev 10995)
@@ -20,9 +20,11 @@
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
---- awscli-1.2.9.orig/awscli/customizations/cloudtrail.py
-+++ awscli-1.2.9/awscli/customizations/cloudtrail.py
-@@ -16,7 +16,7 @@ import sys
+Index: awscli-1.3.18/awscli/customizations/cloudtrail.py
+===================================================================
+--- awscli-1.3.18.orig/awscli/customizations/cloudtrail.py	2014-06-22 23:43:31.781932022 +0900
++++ awscli-1.3.18/awscli/customizations/cloudtrail.py	2014-06-22 23:43:31.777932077 +0900
+@@ -16,7 +16,7 @@
  
  from awscli.customizations.commands import BasicCommand
  from awscli.customizations.service import Service
@@ -31,19 +33,23 @@
  
  
  LOG = logging.getLogger(__name__)
---- awscli-1.2.9.orig/awscli/customizations/s3/tasks.py
-+++ awscli-1.2.9/awscli/customizations/s3/tasks.py
-@@ -4,7 +4,7 @@ import os
- import time
+Index: awscli-1.3.18/awscli/customizations/s3/tasks.py
+===================================================================
+--- awscli-1.3.18.orig/awscli/customizations/s3/tasks.py	2014-06-22 23:43:31.781932022 +0900
++++ awscli-1.3.18/awscli/customizations/s3/tasks.py	2014-06-22 23:44:46.148734524 +0900
+@@ -5,7 +5,7 @@
+ import socket
  import threading
  
 -from botocore.vendored import requests
 +import requests
+ from botocore.exceptions import IncompleteReadError
  
  from awscli.customizations.s3.utils import find_bucket_key, MD5Error, \
-     operate, ReadFileChunk, relative_path
---- awscli-1.2.9.orig/awscli/paramfile.py
-+++ awscli-1.2.9/awscli/paramfile.py
+Index: awscli-1.3.18/awscli/paramfile.py
+===================================================================
+--- awscli-1.3.18.orig/awscli/paramfile.py	2014-06-22 23:43:31.781932022 +0900
++++ awscli-1.3.18/awscli/paramfile.py	2014-06-22 23:43:31.777932077 +0900
 @@ -15,7 +15,7 @@
  import logging
  import os
@@ -52,4 +58,17 @@
 +import requests
  import six
  
+ from awscli.compat import compat_open
+Index: awscli-1.3.18/awscli/testutils.py
+===================================================================
+--- awscli-1.3.18.orig/awscli/testutils.py	2014-06-20 06:28:08.000000000 +0900
++++ awscli-1.3.18/awscli/testutils.py	2014-06-22 23:46:03.159495572 +0900
+@@ -45,7 +45,7 @@
+ from botocore.hooks import HierarchicalEmitter
+ from botocore.session import Session
+ import botocore.loaders
+-from botocore.vendored import requests
++import requests
  
+ import awscli.clidriver
+ from awscli.plugin import load_plugins