[patch] Roundup patch against 0.30.4

genlop-0.30.4-roundup.patch (text/plain), 3.64 KB, created by Jeroen Roovers (RETIRED) on 2005-08-16 12:06:19 UTC

diff -u genlop-0.30.4/genlop genlop-0.30.4-r3/genlop
--- genlop-0.30.4/genlop	2005-07-29 17:30:48.000000000 +0200
+++ genlop-0.30.4-r3/genlop	2005-08-16 20:27:01.000000000 +0200
@@ -441,10 +441,10 @@
                 my $handle;
                 open_file($logfile, \$handle);
                 foreach (<$handle>) {
-                    if (m/^(.*?)\:  \>\>\> emerge.*?$ebuild_arg.*/) {
+                    if (m/^(.*?)\:  \>\>\> emerge.*?\/$ebuild_arg-[0-9].*/) {
                         $e_start = $1;
                     }
-                    if (m/^(.*?)\:  ::: completed .*?\) .*$ebuild_arg.* to \//)
+                    if (m/^(.*?)\:  ::: completed .*?\) .*\/$ebuild_arg-[0-9].* to \//)
                     {
                         $e_end = $1;
                         $tm_secondi += ($e_end - $e_start);
@@ -498,26 +498,16 @@
     # we need to check for it, basically sandboxing is on if
     # FEATURES contains 'sandbox' and does not contain 'userpriv'
     # FEATURES contains 'sandbox' and contains both 'userpriv' and 'usersandbox'
-    my $FEATURES = qx(/usr/bin/portageq envvar FEATURES);
-    if ($FEATURES !~ /sandbox/) {
-        # that should match usersandbox too :-)
-        print "It looks like you don't have sandboxing enabled in portage.\n";
-        print "Please enable it to use the --current option\n";
-        exit;
-    }
-    if ($FEATURES =~ /userpriv/ && $FEATURES !~ /usersandbox/) {
-        print "It looks like you are using the portage \'userpriv\' FEATURE.\n";
-        print "If you want to use the --current option you should either:\n";
-        print "disable \'userpriv\' or add \'usersandbox\'\n";
-        exit;
-    }
+    
+    # 20050815 - JeR: On slow systems, running portageq takes a lot of time,
+    # sometimes enough to miss all the sandbox action completely. Better to
+    # not check for sanity and have users check their FEATURES instead.
     my @targets      = ();
-    my @sandbox_pids = qx{ps --no-header -o pid -C sandbox};
+    my @sandbox_pids = qx{pgrep sandbox};
     if (scalar @sandbox_pids == 0) {
         print colored("!!!", $COLORS{'red'});
         print " Error: no working merge found.\n";
-        print "(the -c option only works if there is"
-          ." an ongoing compilation, sorry)\n";
+        print "(If you feel this may be in error, please consult the manual.)\n";
         exit;
     }
     foreach my $pid (@sandbox_pids) {
@@ -542,12 +532,12 @@
             my $handle;
             open_file($logfile, \$handle);
             foreach (<$handle>) {
-                if (m/^(.*?)\:  \>\>\> emerge .*?\)(.*?\/$ebuild_arg.*?)to \//)
+                if (m/^(.*?)\:  \>\>\> emerge .*?\)(.*?\/$ebuild_arg-[0-9].*?)to \//)
                 {
                     $e_start   = $1;
                     $e_current = $2;
                 }
-                if (m/^(.*?)\:  ::: completed .*?\) .*$ebuild_arg.* to \//) {
+                if (m/^(.*?)\:  ::: completed .*?\) .*\/$ebuild_arg-[0-9].* to \//) {
                     $e_end = $1;
                     $e_count++;
                     &gtime($e_end - $e_start);
diff -u genlop-0.30.4/genlop.1 genlop-0.30.4-r3/genlop.1
--- genlop-0.30.4/genlop.1	2005-07-29 18:20:43.000000000 +0200
+++ genlop-0.30.4-r3/genlop.1	2005-08-16 20:51:23.000000000 +0200
@@ -168,6 +168,8 @@
 .br
 Perl module Time::Duration is no longer required since genlop 0.30
 .SH "BUGS"
+.RB "- The " "--current" " option only works if FEATURES contains 'sandbox' and does not contain 'userpriv', or if FEATURES contains 'sandbox' and 'userpriv' and 'usersandbox'. You can check this by running `portageq envvar FEATURES\' and checking its output."
+.TP
  - definitley too many options !
 .SH "AUTHORS"
 .LP