← Back to branch summary

~ubuntu-branches/ubuntu/utopic/modules/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/patches/testsuite-fix.patch

  • Committer: Package Import Robot
  • Author(s): Alastair McKinstry
  • Date: 2013-11-10 18:50:04 UTC
  • Revision ID: package-import@ubuntu.com-20131110185004-bpgd6k062mr7z00w
Tags: 3.2.10-6
http://bugs.debian.org/711955
Make init/.modulespath a conffile. Closes: #711955. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/testsuite-fix.patch
1
1
Author: Alastair McKinstry <mckinstry@debian.org>
2
2
Description: Fix needed for version strings with braces in them.
3
 
Last-Updated: 2013-10-14
 
3
Last-Updated: 2013-11-10
4
4
Forwarded: no
5
5
 
6
6
Index: modules-3.2.10/testsuite/modules.50-cmds/095-uname.exp
7
7
===================================================================
8
 
--- modules-3.2.10.orig/testsuite/modules.50-cmds/095-uname.exp 2013-10-14 13:48:52.000000000 +0100
9
 
+++ modules-3.2.10/testsuite/modules.50-cmds/095-uname.exp      2013-10-14 14:05:41.000000000 +0100
10
 
@@ -43,6 +43,8 @@
 
8
--- modules-3.2.10.orig/testsuite/modules.50-cmds/095-uname.exp 2013-10-26 22:16:15.000000000 +0100
 
9
+++ modules-3.2.10/testsuite/modules.50-cmds/095-uname.exp      2013-11-10 18:53:48.000000000 +0000
 
10
@@ -43,13 +43,19 @@
11
11
 
12
12
 regsub -all \# $u_version {\\#} u_version
13
13
 regsub -all { } $u_version {\\ } u_version
16
16
 regsub -all {\(} $u_domainname {\\(} u_domainname
17
17
 regsub -all {\)} $u_domainname {\\)} u_domainname
18
18
 
 
19
 test_cmd "csh" "load $module/sysname" "$lm/sysname ;$lmf/sysname ;$ts$u_sysname ;"
 
20
 test_cmd "csh" "load $module/nodename" "$lm/nodename ;$lmf/nodename ;$ts$u_nodename ;"
 
21
 if { $u_domainname != "unknown" } {
 
22
+    if { $u_domainname == "" }  {
 
23
+       test_cmd "csh" "load $module/domain" "$lm/domain ;$lmf/domain ;"
 
24
+    } else { 
 
25
        test_cmd "csh" "load $module/domain" "$lm/domain ;$lmf/domain ;$ts$u_domainname ;"
 
26
+    }
 
27
 } else {
 
28
        test_cmd_re "csh" "load $module/domain" "$lm/domain ;$lmf/domain ;$ts.* ;"
 
29
 }