Bug 504470 – sci-mathematics/octave-3.8.0 - octave-3.8.0-pkgbuilddir.patch breaks pkg.m

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Andrej Lajovic 2014-03-13 11:09:08 UTC]

Created attachment 372548 [details, diff]
Corrected patch.

The patch dispatched and applied with octave-3.8.* ebuilds breaks pkg.m:

octave:1> pkg install package.tar.gz
parse error near line 140 of file /usr/share/octave/3.8.1/m/pkg/private/install.m

>>>     endfor
             ^

error: 'if' command matched by 'endfor' near line 140 column 5
error: called from:
error:   /usr/share/octave/3.8.1/m/pkg/pkg.m at line 394, column 9

The source of the problem lies in octave-3.8.0-pkgbuilddir.patch: instead of modifying an if clause, it adds the modified version and leaves the original line intact. A corrected patch is attached to this report.

[Comment 1 Jeroen Roovers (RETIRED) 2014-03-13 16:12:01 UTC]

Comment on attachment 372548 [details, diff]
Corrected patch.

--- files/octave-3.8.0-pkgbuilddir.patch        2014-02-19 01:52:33.000000000 +0100
+++ -   2014-03-13 17:10:58.574804901 +0100
@@ -1,9 +1,10 @@
---- octave-3.8.0-orig/scripts/pkg/private/install.m    2013-12-28 08:57:42.000000000 +1100
-+++ octave-3.8.0/scripts/pkg/private/install.m 2014-02-10 00:59:40.747194765 +1100
-@@ -63,6 +63,14 @@
+--- octave-3.8.0-orig/scripts/pkg/private/install.m    2013-12-27 22:57:42.000000000 +0100
++++ octave-3.8.0/scripts/pkg/private/install.m 2014-03-13 11:56:44.754360589 +0100
+@@ -62,7 +62,14 @@
+     for i = 1:length (files)
        tgz = files{i};
  
-       if (exist (tgz, "file"))
+-      if (exist (tgz, "file"))
 +      ## The filename pointed to an uncompressed package to begin with.
 +      if (exist (tgz, "dir"))
 +        if (tgz(1) == '/')
@@ -15,7 +16,7 @@
          ## Create a temporary directory.
          tmpdir = tmpnam ();
          tmpdirs{end+1} = tmpdir;
-@@ -89,20 +97,12 @@
+@@ -89,20 +96,12 @@
          if (length (dirlist) > 3)
            error ("bundles of packages are not allowed");
          endif

[Comment 2 Sébastien Fabbro (RETIRED) 2014-04-15 22:57:07 UTC]

+*octave-3.8.1-r1 (15 Apr 2014)
+
+  15 Apr 2014; Sébastien Fabbro <[e-mail]>
+  +files/octave-3.8.1-pkgbuilddir.patch, +octave-3.8.1-r1.ebuild,
+  -files/octave-3.4.3-help.patch, -files/octave-3.8.0-JIT-64-bit-indexing.patch,
+  -files/octave-3.8.0-avoid-gui-sigsegv-if-curl-is-not-available.patch,
+  -files/octave-3.8.0-imagemagick.patch, -octave-3.8.0.ebuild,
+  -octave-3.8.1_rc4-r1.ebuild, -octave-3.8.1_rc4.ebuild, metadata.xml:
+  Fixed bug #504470, thanks jer, fixed for gui prefix, add sub-slotted
+  dependencies, general cleanup
+

[Comment 3 Sébastien Fabbro (RETIRED) 2014-04-15 22:57:28 UTC]

*** Bug 505410 has been marked as a duplicate of this bug. ***

[Comment 4 Jeroen Roovers (RETIRED) 2014-04-16 23:28:37 UTC]

(In reply to Sébastien Fabbro from comment #2)
> +*octave-3.8.1-r1 (15 Apr 2014)
> +
> +  15 Apr 2014; Sébastien Fabbro <[e-mail]>
> +  +files/octave-3.8.1-pkgbuilddir.patch, +octave-3.8.1-r1.ebuild,
> +  -files/octave-3.4.3-help.patch,
> -files/octave-3.8.0-JIT-64-bit-indexing.patch,
> +  -files/octave-3.8.0-avoid-gui-sigsegv-if-curl-is-not-available.patch,
> +  -files/octave-3.8.0-imagemagick.patch, -octave-3.8.0.ebuild,
> +  -octave-3.8.1_rc4-r1.ebuild, -octave-3.8.1_rc4.ebuild, metadata.xml:
> +  Fixed bug #504470, thanks jer, fixed for gui prefix, add sub-slotted
> +  dependencies, general cleanup
> +

Could you actually read the bug reports and thank the right people for all the work they have done? This isn't the first time you got the attribution wrong.

[Comment 5 Jeroen Roovers (RETIRED) 2014-04-18 14:17:08 UTC]

*** Bug 507960 has been marked as a duplicate of this bug. ***