Package: astk / 1.13.1-2

0002-tcl_fixpath.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
From: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
Date: Mon, 7 Apr 2014 09:03:06 +0200
Subject: tcl_fixpath

---
 ASTK_CLIENT/lib/aide.tcl       |    2 +-
 ASTK_CLIENT/lib/asjob_main.tcl |   12 ++++++------
 ASTK_CLIENT/lib/convbase.tcl   |    2 +-
 ASTK_CLIENT/lib/fichier.tcl    |    4 ++--
 ASTK_CLIENT/lib/i_serv.tcl     |    2 +-
 ASTK_CLIENT/lib/ihm_outils.tcl |    2 +-
 ASTK_CLIENT/lib/ihm_rex.tcl    |    2 +-
 ASTK_CLIENT/lib/init_env.tcl   |    2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ASTK_CLIENT/lib/aide.tcl b/ASTK_CLIENT/lib/aide.tcl
index edf4cec..294a14a 100644
--- a/ASTK_CLIENT/lib/aide.tcl
+++ b/ASTK_CLIENT/lib/aide.tcl
@@ -144,7 +144,7 @@ proc ata_envoi { parent } {
    set idexp [open $ftmp w]
    write_server_infos $idexp $serv
    close $idexp
-   append lcmd [file join $ashare::prefix "bin" as_run]
+   append lcmd [file join $ashare::prefix "usr/bin" as_run]
    append lcmd " --proxy --sendmail --schema=[get_schema $serv sendmail]"
    append [ashare::get_glob_args]
    append argu "--report_to=$astk::agla(mail_ata) "
diff --git a/ASTK_CLIENT/lib/asjob_main.tcl b/ASTK_CLIENT/lib/asjob_main.tcl
index 477ac1e..e434ac1 100644
--- a/ASTK_CLIENT/lib/asjob_main.tcl
+++ b/ASTK_CLIENT/lib/asjob_main.tcl
@@ -244,7 +244,7 @@ proc suppr_job { w } {
                      puts $idexp "P noeud $noeud"
                      close $idexp
                      set retour -1
-                     append cmd [file join $ashare::prefix "bin" as_run]
+                     append cmd [file join $ashare::prefix "usr/bin" as_run]
                      append cmd " --proxy --del --schema=[get_schema $nsrv stop_del] $ftmp"
                      append lcmd [ashare::get_glob_args]
                      append cmd " --signal=KILL ; "
@@ -306,7 +306,7 @@ proc purge_job { } {
       set idexp [open $ftmp w]
       write_server_infos $idexp $nsrv
       close $idexp
-      set cmd [file join $ashare::prefix "bin" as_run]
+      set cmd [file join $ashare::prefix "usr/bin" as_run]
       append cmd [ashare::get_glob_args]
       append cmd " --proxy --purge_flash --schema=[get_schema $nsrv purge_flash] $ftmp"
       set id [array startsearch asjob::TextJobs]
@@ -371,7 +371,7 @@ proc susp_job { w } {
                puts $idexp "P noeud $noeud"
                close $idexp
                set lcmd ""
-               append lcmd [file join $ashare::prefix "bin" as_run]
+               append lcmd [file join $ashare::prefix "usr/bin" as_run]
                append lcmd " --proxy --del --schema=[get_schema $nsrv stop_del] $ftmp"
                append lcmd [ashare::get_glob_args]
                append lcmd " --signal=USR1"
@@ -493,7 +493,7 @@ proc editJobSel {w type} {
                puts $idexp "P edit_type $type"
                close $idexp
                set lcmd ""
-               append lcmd [file join $ashare::prefix "bin" as_run]
+               append lcmd [file join $ashare::prefix "usr/bin" as_run]
                append lcmd " --proxy --edit --schema=[get_schema $nsrv edit] $ftmp"
                if { $action == "output_html" } {
                   append lcmd " --result_to_output"
@@ -566,7 +566,7 @@ proc getResultsSel { w } {
                puts $idexp "P mode $mode"
                close $idexp
                set lcmd ""
-               append lcmd [file join $ashare::prefix "bin" as_run]
+               append lcmd [file join $ashare::prefix "usr/bin" as_run]
                append lcmd " --proxy --get_results --schema=[get_schema $nsrv get_results]"
                append lcmd [ashare::get_glob_args]
                set argu "$ftmp"
@@ -635,7 +635,7 @@ proc tailJobSel { w } {
             puts $idexp "P tail_regexp $expr_tail"
             close $idexp
             set lcmd ""
-            append lcmd [file join $ashare::prefix "bin" as_run]
+            append lcmd [file join $ashare::prefix "usr/bin" as_run]
             append lcmd " --proxy --tail --schema=[get_schema $nsrv tail] $ftmp"
             append lcmd [ashare::get_glob_args]
             set retour [ashare::rexec_cmd -1 astk::config $lcmd "" 0 out $asjob::fen_root progress]
diff --git a/ASTK_CLIENT/lib/convbase.tcl b/ASTK_CLIENT/lib/convbase.tcl
index cd56959..9320dd0 100644
--- a/ASTK_CLIENT/lib/convbase.tcl
+++ b/ASTK_CLIENT/lib/convbase.tcl
@@ -110,7 +110,7 @@ proc run_ConvBase { {numfich -1} } {
    set lcmd ""
    set argu ""
 # profil
-   append lcmd [file join $ashare::prefix "bin" as_run]
+   append lcmd [file join $ashare::prefix "usr/bin" as_run]
    append lcmd " --proxy --serv --schema=[get_schema $serv serv]"
    append lcmd [ashare::get_glob_args]
    if { [is_localhost_serv $serv_export] == 0 } {
diff --git a/ASTK_CLIENT/lib/fichier.tcl b/ASTK_CLIENT/lib/fichier.tcl
index d4f65ec..81fe9a3 100644
--- a/ASTK_CLIENT/lib/fichier.tcl
+++ b/ASTK_CLIENT/lib/fichier.tcl
@@ -320,7 +320,7 @@ proc importer { type { append "non"}} {
       write_server_infos $idexp $srv
       close $idexp
       # as_run --get_export testcase
-      append lcmd [file join $ashare::prefix "bin" as_run]
+      append lcmd [file join $ashare::prefix "usr/bin" as_run]
       append lcmd " --proxy --get_export --schema=[get_schema $srv get_export] $ftmp"
       append lcmd " --vers=$astk::profil(version)"
       append lcmd " $tst"
@@ -496,7 +496,7 @@ proc insert_in_db {} {
    # prparation de la ligne de commande  excuter
       set lcmd ""
       set argu ""
-      append lcmd [file join $ashare::prefix "bin" as_run]
+      append lcmd [file join $ashare::prefix "usr/bin" as_run]
       append lcmd " --proxy --insert_in_db --schema=[get_schema $serv insert_in_db]"
       append lcmd [ashare::get_glob_args]
       append argu $astk::profil(nom_fich_export)
diff --git a/ASTK_CLIENT/lib/i_serv.tcl b/ASTK_CLIENT/lib/i_serv.tcl
index 1cec8c2..e8d0717 100644
--- a/ASTK_CLIENT/lib/i_serv.tcl
+++ b/ASTK_CLIENT/lib/i_serv.tcl
@@ -107,7 +107,7 @@ proc lance_astk_serv { batch } {
    set lcmd ""
    set argu ""
    # as_exec fichier_export
-   append lcmd [file join $ashare::prefix "bin" as_run]
+   append lcmd [file join $ashare::prefix "usr/bin" as_run]
    append lcmd " --proxy --serv --schema=[get_schema $serv serv]"
    append lcmd [ashare::get_glob_args]
    if { [is_localhost_serv $astk::profil(serv_fich_export)] == 0 } {
diff --git a/ASTK_CLIENT/lib/ihm_outils.tcl b/ASTK_CLIENT/lib/ihm_outils.tcl
index 4325463..cc87e32 100644
--- a/ASTK_CLIENT/lib/ihm_outils.tcl
+++ b/ASTK_CLIENT/lib/ihm_outils.tcl
@@ -331,7 +331,7 @@ proc run_Stanley { {numfich -1} } {
    set argu ""
 # tool_stanley profil
    #XXX assert serv_export == -1 !
-   append lcmd [file join $ashare::prefix "bin" as_run]
+   append lcmd [file join $ashare::prefix "usr/bin" as_run]
    append lcmd " --proxy --serv --schema=[get_schema $serv serv]"
    append lcmd [ashare::get_glob_args]
    if { [is_localhost_serv $serv_export] == 0 } {
diff --git a/ASTK_CLIENT/lib/ihm_rex.tcl b/ASTK_CLIENT/lib/ihm_rex.tcl
index d582f53..39b5a09 100644
--- a/ASTK_CLIENT/lib/ihm_rex.tcl
+++ b/ASTK_CLIENT/lib/ihm_rex.tcl
@@ -249,7 +249,7 @@ proc rex_envoi { parent fich_asso } {
 # prparation de la ligne de commande  excuter
    set lcmd ""
    set argu ""
-   append lcmd [file join $ashare::prefix "bin" as_run]
+   append lcmd [file join $ashare::prefix "usr/bin" as_run]
    append lcmd " --proxy --create_issue --schema=[get_schema $serv create_issue]"
    append lcmd [ashare::get_glob_args]
    append argu $frex
diff --git a/ASTK_CLIENT/lib/init_env.tcl b/ASTK_CLIENT/lib/init_env.tcl
index 2cccff7..2736f03 100644
--- a/ASTK_CLIENT/lib/init_env.tcl
+++ b/ASTK_CLIENT/lib/init_env.tcl
@@ -132,7 +132,7 @@ proc recup_info { parent serv } {
    set idexp [open $ftmp w]
    write_server_infos $idexp $serv
    close $idexp
-   set lcmd [file join $ashare::prefix "bin" as_run]
+   set lcmd [file join $ashare::prefix "usr/bin" as_run]
    append lcmd " --proxy --info --schema=[get_schema $serv info] $ftmp"
    append lcmd [ashare::get_glob_args]
 # on n'ajoute pas les protocoles en argument :