Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

1270 Fix xml parsing in common.sh #1271

Merged
merged 4 commits into from
Apr 15, 2019
Merged

1270 Fix xml parsing in common.sh #1271

merged 4 commits into from
Apr 15, 2019

Conversation

tst-jlarocco
Copy link
Contributor

Simplified and fixed the call to xmllint that the install and uninstall scripts use to parse XML.

Simplifies the call to xmllint and avoids the extra output from the --shell option
Also added --nonet to avoid network access for XML files with a DTD.
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

ℹ️ Googlers: Go here for more info.

@tst-rwildes tst-rwildes self-requested a review April 12, 2019 12:14
@tst-rwildes tst-rwildes changed the base branch from master to release_5.3.0 April 12, 2019 12:16
@tst-rwildes tst-rwildes added cla: yes Manual verification that all contributors have signed the CLA. and removed cla: no labels Apr 12, 2019
@googlebot
Copy link

☹️ Sorry, but only Googlers may change the label cla: yes.

@googlebot googlebot removed the cla: yes Manual verification that all contributors have signed the CLA. label Apr 12, 2019
@tst-jlarocco tst-jlarocco reopened this Apr 12, 2019
@googlebot
Copy link

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added the cla: yes Manual verification that all contributors have signed the CLA. label Apr 12, 2019
Copy link
Collaborator

@tst-rwildes tst-rwildes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just code reviewed. Did not test.

@tst-blaird tst-blaird self-requested a review April 15, 2019 18:42
Copy link
Collaborator

@tst-blaird tst-blaird left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested against Ubuntu 14. The uninstall script correctly reported the fusion username. Approved. @tst-rwildes will be verifying against CentOS 6.

@tst-rwildes tst-rwildes merged commit 6afd2c0 into google:release_5.3.0 Apr 15, 2019
husf-dsheremata added a commit to husf-dsheremata/earthenterprise that referenced this pull request Jun 4, 2019
* 'master' of https://github.com/google/earthenterprise:
  1270 Fix xml parsing in common.sh (google#1271)
  1192 update openjpeg to 2.3.1 (google#1269)
  Documented required boost dependency for Ubuntu 14 (google#1264)
  [WIP] Resolve issue google#798 - investigate Qt build performance (google#1245)
  Copy uninstall scripts (google#1232)
  refresh commit
  Issue google#1255 - Limits internal version string to 3 parts to fix various errors with patch releases (google#1256)
  Move build number to release rpm (google#1252)
  fix version
  link up 5.3.1 doc folder (google#1249)
  I1246 create 5.3.1 doc folder from copy of 5.3.0 doc folder (google#1248)
  change version files over to 5.3.1 (google#1247)
  start of 5.3.1
  Fixes google#279 - Admin Console password will be preserved on GEE server upgrade (google#1243)
  google#1201 - Fix issue with setting source date when using .kip directories (google#1234)
  I1228 Add y-scroll-bar to GLC Assembly webpage (google#1230)
  google#1236 Polygons constructor can accept KML as a string (google#1239)
  I1225 Re-add GROUPNAME to install_server.sh (google#1233)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla: yes Manual verification that all contributors have signed the CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants