Loading

Paste #pspdqkyop

  1. diff --git a/Makefile b/Makefile
  2. --- a/Makefile
  3. +++ b/Makefile
  4. @@ -51,13 +51,13 @@ bundle: $(BUNDLE_DIR)/$(BUNDLE_FILENAME)
  5.         mkdir -p "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)/lang"
  6.         cp $(SOURCES) $(DOCS) "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)"
  7.         cp $(LANGFILES) "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)/lang"
  8. -       sed -i 's/^PROGRAM_VERSION.*/PROGRAM_VERSION <- $(REPO_VERSION);/' "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)/info.nut"
  9. -       sed -i 's/^PROGRAM_DATE.*/PROGRAM_DATE <- "$(REPO_DATE)";/' "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)/info.nut"
  10. -       sed -i 's/^PROGRAM_NAME.*/PROGRAM_NAME <- "$(DISPLAY_NAME)";/' "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)/info.nut"
  11. +       sed -e 's/^PROGRAM_VERSION.*/PROGRAM_VERSION <- $(REPO_VERSION);/' \
  12. +           -e 's/^PROGRAM_DATE.*/PROGRAM_DATE <- "$(REPO_DATE)";/' \
  13. +           -e 's/^PROGRAM_NAME.*/PROGRAM_NAME <- "$(DISPLAY_NAME)";/' < info.nut > "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)/info.nut"
  14.         cd $(BUNDLE_DIR); tar -cf "$(BUNDLE_FILENAME).tar" "$(BUNDLE_FILENAME)"
  15.  
  16.  bananas: bundle
  17.         echo "[BaNaNaS]"
  18. -       sed 's/^version *=.*/version = $(REPO_VERSION)/' $(BANANAS_INI) > "$(BUNDLE_DIR)/$(BANANAS_INI)"
  19. +       sed -e 's/^version *=.*/version = $(REPO_VERSION)/' $(BANANAS_INI) > "$(BUNDLE_DIR)/$(BANANAS_INI)"
  20.         $(MUSA) -r -x license.txt -c $(BUNDLE_DIR)/$(BANANAS_INI) "$(BUNDLE_DIR)/$(BUNDLE_FILENAME)"
  21.  
  22. diff --git a/check_lang_compatibility.py b/check_lang_compatibility.py
  23. --- a/check_lang_compatibility.py
  24. +++ b/check_lang_compatibility.py
  25. @@ -58,8 +58,12 @@ def get_langfile_rev(name, rev):
  26.      @return: Lines wit string names.
  27.      @rtype:  C{list} of C{str}
  28.      """
  29. +    # Copy the environment, and add HGPLAIN
  30. +    env = dict(kv for kv in os.environ.items())
  31. +    env['HGPLAIN'] = ''
  32. +
  33.      cmd = ['hg', 'cat', '-r', rev, name]
  34. -    txt = subprocess.check_output(cmd, universal_newlines=True, env={'HGPLAIN':''})
  35. +    txt = subprocess.check_output(cmd, universal_newlines=True, env=env)
  36.  
  37.      lines = []
  38.      for line in txt.split('\n'):

Comments