[cylc] 16/33: More fixes.
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sat Dec 12 14:24:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cylc.
commit 276ba9f9dacfc6960633c915a5667512217a1533
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Nov 14 16:16:17 2014 +0000
More fixes.
---
debian/bash_completion.d/cylc | 16 ++++-
debian/control | 1 +
cylc.links => debian/cylc.links | 0
debian/patches/envvars.patch | 127 ++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/python-cylc.install | 1 +
debian/python-cylc.links | 1 +
7 files changed, 145 insertions(+), 2 deletions(-)
diff --git a/debian/bash_completion.d/cylc b/debian/bash_completion.d/cylc
index 73aa9d2..70e9d32 100644
--- a/debian/bash_completion.d/cylc
+++ b/debian/bash_completion.d/cylc
@@ -1,6 +1,18 @@
+# Initial cut of bash completion. Could be smarter.
complete -W "\
-help all db database preparation information discovery control utility \
+5to6 all db database preparation help information discovery control utility \
+broadast cat-log cat-state check-software check-triggering check-versions \
+conditions copy cycle-point datetime cycletime depend diff compare documentation browse \
+dump edit email-suite email-task failed task-failed get-directory get-gui-config \
+get-site-config get-global-config get-suite-config get-config \
+gpanel graph gsummary gui hold import-examples insert \
+job-kill job-poll job-submit kill list ls message task-message \
+monitor nudge ping poll print purge random rnd refresh register release unhold \
+reload remove reregister rename reset restart run \
+start scan scp-transfer search grep set-runahead set-verbosity show \
+started task-started stop shutdown submit single succeeded task-succeeded suite-state \
+test-battery test-db trigger unregister upgrade-db upgrade-run-dir \
+validate view warranty \
task hook admin license GPL \
-v --version -h --help \
" -f cylc
-
diff --git a/debian/control b/debian/control
index add82b7..7621000 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: cylc
Section: utils
Priority: optional
Maintainer: Alastair McKinstry <mckinstry at debian.org>
+Build-Conflicts: cylc
Build-Depends: debhelper (>= 9), dh-python, python-all-dev,
python-pygraphviz, pyro, python-jinja2,
texlive-latex-extra, texlive-fonts-recommended, lmodern, tex4ht, imagemagick, sqlite3
diff --git a/cylc.links b/debian/cylc.links
similarity index 100%
rename from cylc.links
rename to debian/cylc.links
diff --git a/debian/patches/envvars.patch b/debian/patches/envvars.patch
new file mode 100644
index 0000000..7666536
--- /dev/null
+++ b/debian/patches/envvars.patch
@@ -0,0 +1,127 @@
+Index: cylc-6.1.0/lib/cylc/cfgspec/gcylc.py
+===================================================================
+--- cylc-6.1.0.orig/lib/cylc/cfgspec/gcylc.py
++++ cylc-6.1.0/lib/cylc/cfgspec/gcylc.py
+@@ -28,7 +28,8 @@ from cylc.task_state import task_state
+
+ "gcylc config file format."
+
+-SITE_FILE = os.path.join( os.environ['CYLC_DIR'], 'conf', 'gcylcrc', 'themes.rc' )
++CYLC_DIR = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
++SITE_FILE = os.path.join( CYLC_DIR, 'conf', 'gcylcrc', 'themes.rc' )
+ USER_FILE = os.path.join( os.environ['HOME'], '.cylc', 'gcylc.rc' )
+
+ SPEC = {
+Index: cylc-6.1.0/lib/cylc/cfgspec/globalcfg.py
+===================================================================
+--- cylc-6.1.0.orig/lib/cylc/cfgspec/globalcfg.py
++++ cylc-6.1.0/lib/cylc/cfgspec/globalcfg.py
+@@ -30,7 +30,8 @@ import cylc.flags
+
+ "Cylc site and user configuration file spec."
+
+-SITE_FILE = os.path.join( os.environ['CYLC_DIR'], 'conf', 'siterc', 'site.rc' )
++CYLC_DIR = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
++SITE_FILE = os.path.join( CYLC_DIR, 'conf', 'siterc', 'site.rc' )
+ USER_FILE = os.path.join( os.environ['HOME'], '.cylc', 'user.rc' )
+
+ SPEC = {
+@@ -57,10 +58,10 @@ SPEC = {
+
+ 'documentation' : {
+ 'files' : {
+- 'html index' : vdr( vtype='string', default="$CYLC_DIR/doc/index.html" ),
+- 'pdf user guide' : vdr( vtype='string', default="$CYLC_DIR/doc/pdf/cug-pdf.pdf" ),
+- 'multi-page html user guide' : vdr( vtype='string', default="$CYLC_DIR/doc/html/multi/cug-html.html" ),
+- 'single-page html user guide' : vdr( vtype='string', default="$CYLC_DIR/doc/html/single/cug-html.html" ),
++ 'html index' : vdr( vtype='string', default="%s/doc/index.html" % CYLC_DIR ),
++ 'pdf user guide' : vdr( vtype='string', default="%s/doc/pdf/cug-pdf.pdf" % CYLC_DIR),
++ 'multi-page html user guide' : vdr( vtype='string', default="%s/doc/html/multi/cug-html.html" % CYLC_DIR ),
++ 'single-page html user guide' : vdr( vtype='string', default="%s/doc/html/single/cug-html.html" % CYLC_DIR ),
+ },
+ 'urls' : {
+ 'internet homepage' : vdr( vtype='string', default="http://cylc.github.com/cylc/" ),
+@@ -174,7 +175,8 @@ class GlobalConfig( config ):
+
+ _DEFAULT = None
+ CONF_BASE = "global.rc"
+- SITE_CONF_DIR = os.path.join(os.environ["CYLC_DIR"], "conf")
++ CYLC_DIR = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
++ SITE_CONF_DIR = os.path.join(CYLC_DIR, "conf")
+ USER_CONF_DIR = os.path.join(os.environ['HOME'], '.cylc')
+ OLD_SITE_CONF_BASE = os.path.join("siterc", "site.rc")
+ OLD_USER_CONF_BASE = os.path.join("user.rc")
+Index: cylc-6.1.0/lib/cylc/cylc_xdot.py
+===================================================================
+--- cylc-6.1.0.orig/lib/cylc/cylc_xdot.py
++++ cylc-6.1.0/lib/cylc/cylc_xdot.py
+@@ -283,7 +283,8 @@ class MyDotWindow( CylcDotViewerCommon )
+ self.actiongroup = actiongroup
+
+ # create new stock icons for group and ungroup actions
+- imagedir = os.environ[ 'CYLC_DIR' ] + '/images/icons'
++ cylcdir = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
++ imagedir = cylcdir + '/images/icons'
+ factory = gtk.IconFactory()
+ for i in [ 'group', 'ungroup' ]:
+ pixbuf = gtk.gdk.pixbuf_new_from_file( imagedir + '/' + i + '.png' )
+Index: cylc-6.1.0/lib/cylc/gui/util.py
+===================================================================
+--- cylc-6.1.0.orig/lib/cylc/gui/util.py
++++ cylc-6.1.0/lib/cylc/gui/util.py
+@@ -93,7 +93,7 @@ class EntryDialog(gtk.MessageDialog):
+ def get_image_dir():
+ """Return the root directory for cylc images."""
+ try:
+- cylc_dir = os.environ['CYLC_DIR']
++ cylc_dir = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
+ except KeyError:
+ # This should not happen (unecessary)
+ raise SystemExit("ERROR: $CYLC_DIR is not defined!")
+Index: cylc-6.1.0/lib/cylc/scheduler.py
+===================================================================
+--- cylc-6.1.0.orig/lib/cylc/scheduler.py
++++ cylc-6.1.0/lib/cylc/scheduler.py
+@@ -686,13 +686,14 @@ class scheduler(object):
+
+ def configure_suite_environment( self ):
+ # static cylc and suite-specific variables:
++ CYLC_DIR = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
+ self.suite_env = {
+ 'CYLC_UTC' : str(flags.utc),
+ 'CYLC_CYCLING_MODE' : str(flags.cycling_mode),
+ 'CYLC_MODE' : 'scheduler',
+ 'CYLC_DEBUG' : str( flags.debug ),
+ 'CYLC_VERBOSE' : str( flags.verbose ),
+- 'CYLC_DIR_ON_SUITE_HOST' : os.environ[ 'CYLC_DIR' ],
++ 'CYLC_DIR_ON_SUITE_HOST' : CYLC_DIR,
+ 'CYLC_SUITE_NAME' : self.suite,
+ 'CYLC_SUITE_REG_NAME' : self.suite, # DEPRECATED
+ 'CYLC_SUITE_HOST' : str( self.host ),
+Index: cylc-6.1.0/lib/cylc/version.py
+===================================================================
+--- cylc-6.1.0.orig/lib/cylc/version.py
++++ cylc-6.1.0/lib/cylc/version.py
+@@ -25,7 +25,7 @@ from cylc.run_get_stdout import run_get_
+ def _get_cylc_version():
+ """Determine and return cylc version string."""
+
+- cylc_dir = os.environ['CYLC_DIR']
++ cylc_dir = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
+
+ if os.path.exists(os.path.join(cylc_dir, ".git")):
+ # We're running in a cylc git repository, so dynamically determine
+Index: cylc-6.1.0/lib/parsec/Jinja2Support.py
+===================================================================
+--- cylc-6.1.0.orig/lib/parsec/Jinja2Support.py
++++ cylc-6.1.0/lib/parsec/Jinja2Support.py
+@@ -72,7 +72,8 @@ def Jinja2Process( flines, dir, inputs=[
+ #| #!/usr/bin/env python
+ #| def foo( value, length, fillchar ):
+ #| return str(value).rjust( int(length), str(fillchar) )
+- fdirs = [os.path.join( os.environ['CYLC_DIR'], 'lib', 'Jinja2Filters' ),
++ CYLC_DIR = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
++ fdirs = [os.path.join( CYLC_DIR, 'lib', 'Jinja2Filters' ),
+ os.path.join( dir, 'Jinja2Filters' ),
+ os.path.join( os.path.join( os.environ['HOME'], '.cylc', 'Jinja2Filters' ))]
+ usedfdirs = []
diff --git a/debian/patches/series b/debian/patches/series
index b4a9e84..df5f41f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
fixes.patch
+envvars.patch
diff --git a/debian/python-cylc.install b/debian/python-cylc.install
index bf4ae50..82c8e93 100644
--- a/debian/python-cylc.install
+++ b/debian/python-cylc.install
@@ -1,2 +1,3 @@
lib/* /usr/lib/python2.7/dist-packages
images/* /usr/share/cylc/images
+VERSION /usr/share/cylc
diff --git a/debian/python-cylc.links b/debian/python-cylc.links
new file mode 100644
index 0000000..66158f9
--- /dev/null
+++ b/debian/python-cylc.links
@@ -0,0 +1 @@
+/usr/share/cylc/conf /etc/cylc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cylc.git
More information about the debian-science-commits
mailing list