Thanks Saurabh for reviewing the changes:
I have made the modifications and the pdiff is as follows:

diff -r 618a7ec42662 -r 36b90e6edc82 src/pull.py
--- a/src/pull.py       Wed Sep 12 08:57:55 2012 -0700
+++ b/src/pull.py       Thu Oct 18 09:20:58 2012 +0530
@@ -989,7 +989,8 @@
                 else:
                         txt += _("No storage space left.")

-                tdirs = [temp_root]
+                temp_root_path = misc.get_temp_root_path()
+                tdirs = [temp_root_path]
                 if cache_dir not in tmpdirs:
                         # Only include in message if user specified.
                         tdirs.append(cache_dir)
@@ -1000,7 +1001,12 @@
error(txt + _("Please verify that the filesystem containing " "the following directories has enough space available:\n"
                    "%s") % "\n".join(tdirs))
-                __ret = 1
+                try:
+                        cleanup()
+                except:
+                        __ret = 99
+                else:
+                        __ret = 1
         except:
                 traceback.print_exc()
                 error(misc.get_traceback_message())

Thanks
Oracle
Thejaswini K
Revenue Product Engineering (RPE), Systems
Phone: +91 8066927709 | Mobile: +91 9663324594
ORACLE India | Off Langford Road | Bangalore | 560025
Green Oracle <http://www.oracle.com/commitment> Oracle is committed to developing practices and products that help protect the environment

On 10/18/12 09:14, Saurabh Vyas wrote:
On 10/17/12 12:19, Thejaswini wrote:
Hi All,

Please review the fixes for the below CR's:

1. 7197510: pkgrecv error handling traces back:
http://monaco.us.oracle.com/detail.jsf?cr=7197510

2. 7197865: pkgrecv dies with ENOSPC:
http://monaco.us.oracle.com/detail.jsf?cr=7197865

Webrev @:
https://cr.opensolaris.org/action/browse/pkg/tk241774/7197510/webrev/

In general these changes LGTM. just small nits :

- src/pull.py
   950 +               __ret = main_func()
   indentation is incorrect

   1005 +                        cleanup(False)
   you can use cleanup() (i.e. without 'False' as arg) as False being
   the default value.

Thanks,
Saurabh


The unit testing has been done.
Also , make packages and make tests is clean.

Thanks,
Thejaswini
_______________________________________________
pkg-discuss mailing list
pkg-discuss@opensolaris.org
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss


_______________________________________________
pkg-discuss mailing list
pkg-discuss@opensolaris.org
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss

Reply via email to