Bug#692976: unblock: modules/3.2.9c-3

To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: Bug#692976: unblock: modules/3.2.9c-3
From: Alastair McKinstry <mckinstry@debian.org>
Date: Sun, 11 Nov 2012 15:39:09 +0000
Message-id: <[🔎] 20121111153909.24996.68750.reportbug@ailm.sceal.ie>
Reply-to: Alastair McKinstry <mckinstry@debian.org>, 692976@bugs.debian.org

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package modules

This is a trivial fix for a path breakage that stops it working properly
on bash shells.

diff -Nru modules-3.2.9c/debian/changelog modules-3.2.9c/debian/changelog
--- modules-3.2.9c/debian/changelog     2012-05-05 20:00:44.000000000 +0100
+++ modules-3.2.9c/debian/changelog     2012-11-04 14:52:40.000000000 +0000
@@ -1,3 +1,10 @@
+modules (3.2.9c-3) unstable; urgency=low
+
+  * Fix broken bash completion. Thanks to Alexy Brodkin for patch.
+    Closes: #691521 
+
+ -- Alastair McKinstry <mckinstry@debian.org>  Sun, 04 Nov 2012 14:51:25 +0000
+
 modules (3.2.9c-2) unstable; urgency=low
 
   * B-D on tcl8.5-dev, not tcl8.5 only.   Closes: #671522.
diff -Nru modules-3.2.9c/debian/patches/fix_paths.patch modules-3.2.9c/debian/patches/fix_paths.patch
--- modules-3.2.9c/debian/patches/fix_paths.patch       2012-05-05 20:00:44.000000000 +0100
+++ modules-3.2.9c/debian/patches/fix_paths.patch       2012-11-04 14:51:18.000000000 +0000
@@ -1,12 +1,12 @@
 Description: Hard-code debian-type paths, as otherwise strange Capitalised paths are used.
 Author: Alastair McKinstry <mckinstry@debian.org>
-Last-Updated: 2012-04-15
+Last-Updated: 2012-11-04
 Forwarded: not-needed
 
 Index: modules-3.2.9c/init/bash.in
 ===================================================================
---- modules-3.2.9c.orig/init/bash.in   2012-04-13 22:37:40.000000000 +0100
-+++ modules-3.2.9c/init/bash.in        2012-04-13 23:29:01.000000000 +0100
+--- modules-3.2.9c.orig/init/bash.in   2012-05-05 20:00:44.000000000 +0100
++++ modules-3.2.9c/init/bash.in        2012-11-04 14:38:07.000000000 +0000
 @@ -7,11 +7,11 @@
  @VERSIONING@fi
  @VERSIONING@export MODULE_VERSION_STACK
@@ -24,8 +24,8 @@
  if [ "${LOADEDMODULES:-}" = "" ]; then
 Index: modules-3.2.9c/init/sh.in
 ===================================================================
---- modules-3.2.9c.orig/init/sh.in     2012-04-13 22:37:40.000000000 +0100
-+++ modules-3.2.9c/init/sh.in  2012-04-13 23:29:01.000000000 +0100
+--- modules-3.2.9c.orig/init/sh.in     2012-05-05 20:00:44.000000000 +0100
++++ modules-3.2.9c/init/sh.in  2012-11-04 14:38:07.000000000 +0000
 @@ -7,10 +7,10 @@
  @VERSIONING@fi
  @VERSIONING@export MODULE_VERSION_STACK
@@ -42,8 +42,8 @@
  if [ "${LOADEDMODULES:-}" = "" ]; then
 Index: modules-3.2.9c/init/csh.in
 ===================================================================
---- modules-3.2.9c.orig/init/csh.in    2012-04-13 22:37:40.000000000 +0100
-+++ modules-3.2.9c/init/csh.in 2012-04-13 23:30:24.000000000 +0100
+--- modules-3.2.9c.orig/init/csh.in    2012-05-05 20:00:44.000000000 +0100
++++ modules-3.2.9c/init/csh.in 2012-11-04 14:38:07.000000000 +0000
 @@ -9,8 +9,8 @@
  @VERSIONING@  setenv MODULE_VERSION           "@VERSION@"
  @VERSIONING@  setenv MODULE_VERSION_STACK     "@VERSION@"
@@ -74,8 +74,8 @@
    setenv MODULEPATH `sed -n 's/[      #].*$//; /./H; $ { x; s/^\n//; s/\n/:/g; p; }' ${MODULESHOME}/init/.modulespath`
 Index: modules-3.2.9c/init/zsh.in
 ===================================================================
---- modules-3.2.9c.orig/init/zsh.in    2012-04-13 22:37:40.000000000 +0100
-+++ modules-3.2.9c/init/zsh.in 2012-04-13 23:29:01.000000000 +0100
+--- modules-3.2.9c.orig/init/zsh.in    2012-05-05 20:00:44.000000000 +0100
++++ modules-3.2.9c/init/zsh.in 2012-11-04 14:38:07.000000000 +0000
 @@ -7,10 +7,10 @@
  @VERSIONING@fi
  @VERSIONING@export MODULE_VERSION_STACK
@@ -92,8 +92,8 @@
  if [ "${LOADEDMODULES:-}" = "" ]; then
 Index: modules-3.2.9c/init/cmake.in
 ===================================================================
---- modules-3.2.9c.orig/init/cmake.in  2012-04-13 22:37:40.000000000 +0100
-+++ modules-3.2.9c/init/cmake.in       2012-04-13 23:29:01.000000000 +0100
+--- modules-3.2.9c.orig/init/cmake.in  2012-05-05 20:00:44.000000000 +0100
++++ modules-3.2.9c/init/cmake.in       2012-11-04 14:38:07.000000000 +0000
 @@ -6,9 +6,9 @@
  @VERSIONING@endif()
  
@@ -117,8 +117,8 @@
    file(STRINGS "$ENV{MODULESHOME}/init/.modulespath" cmi_mp1)
 Index: modules-3.2.9c/init/perl.pm.in
 ===================================================================
---- modules-3.2.9c.orig/init/perl.pm.in        2012-04-13 22:37:40.000000000 +0100
-+++ modules-3.2.9c/init/perl.pm.in     2012-04-13 23:29:01.000000000 +0100
+--- modules-3.2.9c.orig/init/perl.pm.in        2012-05-05 20:00:44.000000000 +0100
++++ modules-3.2.9c/init/perl.pm.in     2012-11-04 14:38:07.000000000 +0000
 @@ -7,14 +7,14 @@
  
  sub module {
@@ -139,8 +139,8 @@
        open(IN, "$ENV{'MODULESHOME'}/init/.modulespath") || die "cannot open '.modulespath' file: $!\n";
 Index: modules-3.2.9c/init/python.py.in
 ===================================================================
---- modules-3.2.9c.orig/init/python.py.in      2012-04-13 22:37:40.000000000 +0100
-+++ modules-3.2.9c/init/python.py.in   2012-04-13 23:29:01.000000000 +0100
+--- modules-3.2.9c.orig/init/python.py.in      2012-05-05 20:00:44.000000000 +0100
++++ modules-3.2.9c/init/python.py.in   2012-11-04 14:38:07.000000000 +0000
 @@ -5,7 +5,7 @@
  @VERSIONING@  os.environ['MODULE_VERSION'] = '@VERSION@'
  @VERSIONING@else:
@@ -163,8 +163,8 @@
  
 Index: modules-3.2.9c/init/ruby.rb.in
 ===================================================================
---- modules-3.2.9c.orig/init/ruby.rb.in        2012-04-13 22:37:40.000000000 +0100
-+++ modules-3.2.9c/init/ruby.rb.in     2012-04-13 23:29:01.000000000 +0100
+--- modules-3.2.9c.orig/init/ruby.rb.in        2012-05-05 20:00:44.000000000 +0100
++++ modules-3.2.9c/init/ruby.rb.in     2012-11-04 14:38:07.000000000 +0000
 @@ -4,7 +4,7 @@
  @VERSIONING@else
  @VERSIONING@  ENV['MODULE_VERSION_STACK'] = ENV['MODULE_VERSION']
@@ -190,15 +190,15 @@
    end
 Index: modules-3.2.9c/init/bash_completion.in
 ===================================================================
---- modules-3.2.9c.orig/init/bash_completion.in        2012-04-13 22:31:52.000000000 +0100
-+++ modules-3.2.9c/init/bash_completion.in     2012-04-13 23:31:01.000000000 +0100
+--- modules-3.2.9c.orig/init/bash_completion.in        2012-05-05 20:00:44.000000000 +0100
++++ modules-3.2.9c/init/bash_completion.in     2012-11-04 14:50:49.000000000 +0000
 @@ -2,8 +2,8 @@
  # Bash commandline completion (bash 3.0 and above) for Modules @VERSION@
  #
  _module_avail() {
 -@VERSIONING@  @BASEPREFIX@/Modules/@VERSION@/bin/modulecmd bash -t avail 2>&1 | sed '
 -@NOTVERSIONING@       @bindir@/modulecmd bash -t avail 2>&1 | sed '
-+@VERSIONING@  /usr/share/modules/@VERSION@/bin/modulecmd bash -t avail 2>&1 | sed '
++@VERSIONING@  modulecmd bash -t avail 2>&1 | sed '
 +@NOTVERSIONING@       /usr/bin/modulecmd bash -t avail 2>&1 | sed '
                /:$/d;
                /:ERROR:/d;
unblock modules/3.2.9c-3

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: powerpc (ppc)

Kernel: Linux 2.6.32-5-powerpc
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/bash

Reply to:

Follow-Ups:
- Bug#692976: marked as done (unblock: modules/3.2.9c-3)
  - From: owner@bugs.debian.org (Debian Bug Tracking System)

Prev by Date: Bug#683053: unblock: python2.7/2.7.3-2
Next by Date: Bug#692977: unblock: cdo/1.5.6.1-2
Previous by thread: Bug#683053: unblock: python2.7/2.7.3-2
Next by thread: Bug#692976: marked as done (unblock: modules/3.2.9c-3)
Index(es):
- Date
- Thread