Merge branch 'MDL-48889-master' of git://github.com/jethac/moodle

moodle · Feb 10, 2015 · 21c7e25 · 21c7e25
2 parents b7164a5 + 20a263e
commit 21c7e25
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/repository/s3/lib.php b/repository/s3/lib.php
@@ -105,7 +105,13 @@ public function get_listing($path = '', $page = '') {
             try {
                 $buckets = $this->s->listBuckets();
             } catch (S3Exception $e) {
-                throw new moodle_exception('errorwhilecommunicatingwith', 'repository', '', $this->get_name());
+                throw new moodle_exception(
+                    'errorwhilecommunicatingwith',
+                    'repository',
+                    '',
+                    $this->get_name(),
+                    $e->getMessage()
+                );
             }
             foreach ($buckets as $bucket) {
                 $folder = array(
@@ -124,7 +130,13 @@ public function get_listing($path = '', $page = '') {
             try {
                 $contents = $this->s->getBucket($bucket, $uri, null, null, '/', true);
             } catch (S3Exception $e) {
-                throw new moodle_exception('errorwhilecommunicatingwith', 'repository', '', $this->get_name());
+                throw new moodle_exception(
+                    'errorwhilecommunicatingwith',
+                    'repository',
+                    '',
+                    $this->get_name(),
+                    $e->getMessage()
+                );
             }
             foreach ($contents as $object) {
 
@@ -199,7 +211,13 @@ public function get_file($filepath, $file = '') {
         try {
             $this->s->getObject($bucket, $uri, $path);
         } catch (S3Exception $e) {
-            throw new moodle_exception('errorwhilecommunicatingwith', 'repository', '', $this->get_name());
+            throw new moodle_exception(
+                'errorwhilecommunicatingwith',
+                'repository',
+                '',
+                $this->get_name(),
+                $e->getMessage()
+            );
         }
         return array('path' => $path);
     }