From fc7c0645fa9c9d47c1462387a3de82a2a4474467 Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Thu, 28 Jul 2016 08:50:52 -0700
Subject: [PATCH] SL-321: add in resource files, more CLI handling fixes

---
 indra/viewer_components/Resources/README      |   9 ++++
 .../viewer_components/Resources/summary.json  |   1 +
 .../manager/InstallerError.py                 |  49 ++++++++++++++++++
 indra/viewer_components/manager/SL_Launcher   |   5 +-
 .../manager/icons/SL_Logo.gif                 | Bin 0 -> 1322 bytes
 .../manager/icons/SL_Logo.png                 | Bin 0 -> 1484 bytes
 .../manager/icons/head-sl-logo.gif            | Bin 0 -> 960 bytes
 .../manager/icons/head-sl-logo.png            | Bin 0 -> 2316 bytes
 .../manager/update_manager.py                 |  11 +++-
 9 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 indra/viewer_components/Resources/README
 create mode 100644 indra/viewer_components/Resources/summary.json
 create mode 100644 indra/viewer_components/manager/InstallerError.py
 create mode 100644 indra/viewer_components/manager/icons/SL_Logo.gif
 create mode 100644 indra/viewer_components/manager/icons/SL_Logo.png
 create mode 100644 indra/viewer_components/manager/icons/head-sl-logo.gif
 create mode 100644 indra/viewer_components/manager/icons/head-sl-logo.png

diff --git a/indra/viewer_components/Resources/README b/indra/viewer_components/Resources/README
new file mode 100644
index 00000000000..e1b35730d41
--- /dev/null
+++ b/indra/viewer_components/Resources/README
@@ -0,0 +1,9 @@
+This directory only exists as a place for the summary.json file to exist when the unit tests are run on a Mac, where the file goes to a sibling directory of the scripts dir.  In Linux and Windows, the JSON file goes into the same directory as the script.
+
+See:
+
+test_get_summary.py
+update_manager.get_summary()
+
+for more details
+- coyot 201606.02
diff --git a/indra/viewer_components/Resources/summary.json b/indra/viewer_components/Resources/summary.json
new file mode 100644
index 00000000000..b78859d4277
--- /dev/null
+++ b/indra/viewer_components/Resources/summary.json
@@ -0,0 +1 @@
+{"Type":"viewer","Version":"4.0.5.315117","Channel":"Second Life Release"}
diff --git a/indra/viewer_components/manager/InstallerError.py b/indra/viewer_components/manager/InstallerError.py
new file mode 100644
index 00000000000..3b199ea2312
--- /dev/null
+++ b/indra/viewer_components/manager/InstallerError.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+
+"""\
+@file InstallerError.py
+@author coyot
+@date 2016-05-16
+@brief custom exception class for VMP
+
+$LicenseInfo:firstyear=2016&license=viewerlgpl$
+Second Life Viewer Source Code
+Copyright (C) 2016, Linden Research, Inc.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation;
+version 2.1 of the License only.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+$/LicenseInfo$
+"""
+
+"""
+usage:
+
+>>> import InstallerError
+>>> import os
+>>> try:
+...    os.mkdir('/tmp')
+... except OSError, oe:
+...    ie = InstallerError.InstallerError(oe, "foo")
+...    raise ie
+
+Traceback (most recent call last):
+  File "<stdin>", line 5, in <module>
+InstallerError.InstallerError: [Errno [Errno 17] File exists: '/tmp'] foo
+"""
+
+class InstallerError(OSError):
+    def __init___(self, message):
+        Exception.__init__(self, message)
diff --git a/indra/viewer_components/manager/SL_Launcher b/indra/viewer_components/manager/SL_Launcher
index dde7cd9c2e1..0403e01cecd 100755
--- a/indra/viewer_components/manager/SL_Launcher
+++ b/indra/viewer_components/manager/SL_Launcher
@@ -106,11 +106,12 @@ def capture_vmp_args(arg_list = None, cmd_line = None):
             no_dashes = vmp_params[param]
             count = cmd_line[no_dashes]['count']
             param_args = []
-            if count:
-               for argh in range(1,count):
+            if count > 0:
+               for argh in range(0,count):
                   param_args.append(vmp_queue.popleft())
             #the parameter name is the key, the (possibly empty) list of args is the value
             cli_overrides[vmp_params[param]] = param_args
+            print "cli override param %s vmp_param %s args %s count %s" % (param, vmp_params[param], param_args, count)
             
    #to prevent KeyErrors on missing keys, set the remainder to None
    for key in vmp_params:
diff --git a/indra/viewer_components/manager/icons/SL_Logo.gif b/indra/viewer_components/manager/icons/SL_Logo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c24d6b08cbda0d7d597932733eb04b9f805b858a
GIT binary patch
literal 1322
zcmb``X;YF3003ZAP*N%o<PZ^F<q`n_0bdmL<q+^(wL{ZVQ8Y7GQSrzl0TJ-XJ2l1I
z4#gZ&YpQiivo=4pGaWN~%}$%`hni-av7P;}&Ft3h{)c`3!=p{sfHFNEhKId*1M^0B
z!Tr1uNVwkt1Tw(SAB7A!=#M%aa0rb;2Oh>?(WoFyAP$4Y1>%CRhX~jpJPtz&!V`lC
zL_Cp1Acq8FsKJC#a!6<h4hRXQQgC4u5<sESLJ4##kwF8(X+$PKVE`mn7@ZMLW`_f8
zI)Te%v6+-eCXvTtN3cS<EGm~p;<JMJY;sftjUPc4aDXUIh%hpe$KmoKDI#vTkV_YF
z`B6N&h({IkI6@vHnopBNMG5(UR3H#Vu_S`97@;s)Ac_`-gTiRBh%Xf}V#Q)<bfioy
z0L9EWi6llWlu1}}X^c!7kq{$`1;uiZlL$)WvPei47az-0%H;`hd{uk`6rTts2$B-x
zREa`OqCyFYw2(rj5a|?ZjY^WLPSUDl(llVYR+p@mWoVOAba7cJ^6b>aV;PE^Ol5AC
z>O{6W??_Vq(X`@xjp1a5;gqhdAo+A*=INp%6~!5qCC9%k&8jZTsVX~OQ*y#so?lyW
z%yjl--Pz;ymAQ>og$>mwnyT}gYfiP+6||WO&)1i=HR#Qa`PQaVOYIr+xf1KS3QM!0
zqq)@9Qr6k3cb-4vY_IIGmJYO+_jelm?G=NLszFQ5faC0tvt-OxH`H}*u&ZUbr*70<
z=yEn(>@|%!PER@;M=!Kpyih&a)jrl=H#yKcIn?GFwz)>?=lZJ`20EuM+NVbyGh^2I
z@#ZTdZI>tNmq%N#jW)Q)%-5#cmd7kh)92me_T@|F>k|(5WcTu{Wp&cI;%f1@dfane
z*QYvH=Q}*p-K*1WYtzFki?$mx4$orW>gCS0S^N5&`PRJi=0fkrQrE4;q4lM{TW;6J
z%GAy4gLhWPZm(Xt>zVlKhHG<eVRL=v{!Q0|8`C>$u19x2|9^l_!K&I)y{XhdYdm8r
zr)iVZGilXTG(9a{UjhR@!oB=qpJ80szy2EoLw<sN{#ylkX16;Kh(o3=$f80V6ph^8
z-v@mBkiJR?P1~}d{K9mvrKMX|bU>^x<iS{MUOxWicO+#y%e4)mfBxv}!%RB>kJxH0
zdVF#T)xZ4y1KR!bpf{>0o0dBVS>T19j~vA=X*Te#c?!&athD&UCG^~uV!VXW<f1ft
zy?=qs`L%%l6hf;z?o*kh4(wy%0{cbq*Sk`V+6N6!P8&B`b|?n>J)+xGmNz5#?swxj
zWTkcchrQbxFXm!<^*t}s>ed}U;ZQ-D=#^)CowxHMl-m^_I9aZ81^+_IvpLm4E2P_S
zUVe`tCq(rb_q?tmI5MX0-2hDabhjHn+eg{6=<-10FPnq!?#<uBSih)zxQpxkHoExA
zA8V=XcGL58K=?z^4i=sTJVcHDHS`Tl4%K#ZEQV~~@Ry*M4Sf{7@hDKne$YdXf3@%A
zTz#rUk&R*>Ehe>6F+j+sE42KnEwc?j>3p6-mm$N_h^e|ggre9mh(NhQcDjSW{Q+MB
z_+;)08w4YKhYL*4Y}j!wwvRW$eeL9azi3Uuo@)BQ@K(+OcH*($UfIJIaKkA6#M>Gl
oT;n{T)*#;&X~@0SZQEhNCTs_tv$B1S6l<WPm99{FCIpN72WzqoQ~&?~

literal 0
HcmV?d00001

diff --git a/indra/viewer_components/manager/icons/SL_Logo.png b/indra/viewer_components/manager/icons/SL_Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e376c72f976253c8d54c0186667552d45bea937
GIT binary patch
literal 1484
zcmZ{kc{J1u6vuyL874E{P?nyUB1UM;NE&)s24gIt$uia~4KMrtvJ_d;AY@AzLSAHx
zl3g;Eyi_LJv5W|B$U1{Cc;o%|{&?q}@BQ5KJ@<R=e>c(G%uq;BQV;+DAtM~tlEafn
z0`YNrSG|`e2QscWOH%;2BL@KY?gPNiA%_eA2u1?HqB8(sasWWgH{FS9z}e+<F*d{k
zheuV|TK1UZ2>9V_0|5XmawIMwH&6V?4Dr(;aro~oV1ml90RWypBdiWVqdz~>*vo!M
zs{8Ij@M^xqC;M@Kc8-xtf@~KSE($v#9DLq_H%72RFuG6<8>?SxRgMj*RD=g7Xe-&)
za+hpO0LqG`<_XjF@ZY)B1fr3(SGGpO9Ji84^KE8giKfqDg-DSsP5RCO{W3-2$Cwe*
zr4i5qvw0NO-dhQ12x{G^9x?9R-p}t)?eX7zEc=caKI8+JEAP=OwV$y{_;ajH<pwA^
zBV7hm-VwW@waPmZyv?VhT`}~G#&CY!#poY&bkGlrPk>$>C{BO`?2<nr#7M#g_Z#4b
z4dbOlHqXbGVexQFy#0tN)ju!0BMQzl=_3Z`=?)yL4TTyWu=qnJYsKW}zCj_vBnO|-
zwq!z8f|C}@_<%iuW}S>T#}{SH;Q4BtxZ5&d2su1rBIu#AYw__ZjqZcJ)ni~X8Lag3
zt9keI{2lSbFCTGN<CdB{T-RPnWLUoRzjs>TC8a#0(?GQjjaE`uWO@BC42M)^p1b+$
zx3`cF9=OYY4P@JTzv*3_dY8XFWqPMDG@q+*q=UF*e7&XyY5jcHJ8tSADj>2|?NmRm
zW8J>QDyKjcOqK8wW%j;vs*7YBm{BnLErX8yPQ^BeI3e9El`PQAgEZZOVZ2BhC}}o*
zGY|x~srs5~Kx_BRIgARCJcYGJWLYZ?6I};SV+Fu8IoQ)w=}Fy6qMq}YDtI=t)<!Z@
zQE%sF(_p{~6D{2BQCSVO8dGa9nTXy(i?*``-HUt+DT{-!Gk8!FSIWW}VWol0v6kQ@
z*_1}VEn|XLHE;C`DorckZ<+R;NncMwIf3+n1@V#*IGa1fXCdyAq(e1V`Its;c@pQ6
zIEO!>+}^yoyH-Ce?)so|I%55{`n+KcK7cJPokk}B@GvGdyVnh+wirAWId?H;2ogp4
zwBGkfwO0God&#9-0w}F!!fWQWT^QmKbqA&CE4k21yDK|OGJ=6^W;Et!8mn`5{nE*#
zfmwmzCtaJf=k&3k8L+Nj^z`0qu}7;t##0#q0`e<zMlcNc;(VLRD^ITseyFtDVk=Z*
z>mZ?|vgu^Ye6op4x<V(>I8W9@YA^OhUoo2%eaxfhj1r*@fzm*AeGgx~UQKwrR6t=;
zW)BUj3~*gdC#-u+6)~0S!^EU7dF%xXw;UN5xjqKlG3wnsR_}ejTU;ei^IB_bXKyda
z>fut4DI%^+D3C^zO`O|GZ1xySJw3a@XitF?9o)o4f-v?!>9$$77W%{lV=b_*jnNjn
zdz2uv+XGSl@#~QdC=_w}^W$r4^A**!s*6AO`hAf|EnL}Tk?o6G?+E#D`4zV|HN)j`
z!8jB8jniQI_R`+gGILg=n`m6zjJLCm+UnqXvobnRL+@d;l<LrR_4gq}3H3)l@Jnx_
z2Y(#DyWek@V}>0tJsYcypeBmQ=YC+eNQW1MURMcaKyecMGdbw8--^|)=()N}%t>z8
zHPonH)x|t5dR5=mckTJl>E-q`9U5ieSw^S0Ua4h~RYmLB2s)kDBqcd{6AFR2sPIcU
zH`d{cCrhOGf;xfQ%0xx2+0@O!<E-zgy4=F?a59-JN~S6z;Z+K>g$vn?HK-D8V-B?+
z+3I*<Us^qX@B6K}h)B+dlMB+f339s`<c@I-aOVI(Ayw6sk?P7wH3AZeQN4sgqt9~&
jB$5eO=KUw&?d#@w>yQ5r#5gR<Z~}mlz8SVk*E!}N<K(Ga

literal 0
HcmV?d00001

diff --git a/indra/viewer_components/manager/icons/head-sl-logo.gif b/indra/viewer_components/manager/icons/head-sl-logo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d635348dccc1988947ec7c41d6a86a86371da207
GIT binary patch
literal 960
zcmZ?wbhEHb3}aAaSgOPj7#SZNofs0692S=vk&qsllo_3z6_c71m!21&k)N1Vn3P?d
zl3SXZU!GoAnNd`gRZ<h(Ru<b)8Q)!<*jt-4p+04DQ`*#)jOlHevpTZpbmh+P&0E-C
zuw-J<vdJYYr<JarQNC{0f0_Zse^Smxsfi`2DGKG8B^e6tp1uJJ`FRS73ciWS42nNl
z7`Yhi8FUzc0OVr^wtola7g+R2be>pJbTY?k{y7gdmZqrnH{P6=&}?#An6zY(?(Btv
zzRNlIxRqtTSNe&E-FnYILwEh}t>x9xvQ74l^&OEy70pe_t+9~|lNq9>mI_woW%dQn
z7LxR4WLe_Ez{JJF!{x-lymT!i8=Lbw4(7Exmak=6!s094IxqilbfGtkz^ScF{7wQ}
zc{~_+PunxF+FxVf5n$z5`{0_lc#lM1VP1Ew%gM(K92YL%-S2dA8Mi$v-`cx;oDb_{
zP8?5RTI}3=Pr>Jr-@FMGTzX%n%ijxa&%R`!Rb0j^!`Q!RlFN@rY>CT!gJ+ni6gfmT
zv$Cr-ZDxOX%_Zw^T?jXOBg4M~j4LgKJk^gpP;+ky(JJmpiQe9GzU5!XasB5E?H{Fh
zA{_)y?p&O3zb4R%?_?vpkFaK^L!wild)2*N3lH#}JQcQ1!!dNX3ez21!AVlLO4gmc
zo6V)5<1j%&e`)3vCGT~rJBwKOn@m#lcD|Ijx#iX~-MM1<D_?G6@LSCnvqEo@j~}1$
zL$g~UnO9d7&Q80l&djPTqQ$Y^;b7Mr)h(yXuFReNQ|#<)C7%loJAG&KNz9W8pJb!E
z=hkN5^|E4)OeL>htW5d;XNh&@hZ9G;Wz-ly_ka2R-q?vvzS8{Zea-1WZwhX9PqdF&
za8ho;p9y{0CY%-z>hImXHd%kemZVus5(ob&xhm!_IDSyciG}$g|83tJ@eR9X9-3ow
z^h4u)ez%R!TdKG1eX*$6K7!$q*vpd-uXk#8u`Os__4dXi{*u2Li%Ol>Bqs}7Tr0ZW
z`>At@r>IK^J7?1$&y18-R=>%qLi1W4IEsk$e2w&<>T7gyVyaeTaH?|!=OI=hmrrei
zVmp2=W8x6W%2-%DNi$7%nPGv(BIgMuv1}3?>5gnyGruS0hJM<zqRmQ4@JY|c+*bk1
aPuEtRUFO5m>FR8grSf2ENS+i6gEatM+{p6)

literal 0
HcmV?d00001

diff --git a/indra/viewer_components/manager/icons/head-sl-logo.png b/indra/viewer_components/manager/icons/head-sl-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c214e96d1cc22698384815cd696cb780fd0e16a
GIT binary patch
literal 2316
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

literal 0
HcmV?d00001

diff --git a/indra/viewer_components/manager/update_manager.py b/indra/viewer_components/manager/update_manager.py
index 398c8bb55da..ff0f69a1b1f 100755
--- a/indra/viewer_components/manager/update_manager.py
+++ b/indra/viewer_components/manager/update_manager.py
@@ -252,8 +252,15 @@ def query_vvm(log_file_handle = None, platform_key = None, settings = None, summ
             #normal case, no testing key
             test_ok = 'testok'
     UUID = make_VVM_UUID_hash(platform_key)
+    print repr(channelname)
+    print repr(version)
+    print repr(platform_key)
+    print repr(platform_version)
+    print repr(test_ok)
+    print repr(UUID)
     #because urljoin can't be arsed to take multiple elements
-    query_string =  '/v1.0/' + channelname + '/' + version + '/' + platform_key + '/' + platform_version + '/' + test_ok + '/' + UUID
+    #channelname is a list because although it can only be one word, it is a kind of argument and viewer args can take multiple keywords.
+    query_string =  '/v1.0/' + channelname[0] + '/' + version + '/' + platform_key + '/' + platform_version + '/' + test_ok + '/' + UUID
     VVMService = llrest.SimpleRESTService(name='VVM', baseurl=base_URI)
     try:
         result_data = VVMService.get(query_string)
@@ -351,7 +358,7 @@ def update_manager(cli_overrides = None):
     parent_dir = get_parent_path(platform_key)
     log_file_handle = get_log_file_handle(parent_dir)
     settings = None
-    print "parent dir: " + str(parent_dir)
+    print "cli_overrides: " + str(cli_overrides)
 
     #check to see if user has install rights
     #get the owner of the install and the current user
-- 
GitLab