Skip to content

Comments

g.mapsets: Do not include additional empty new line#2586

Merged
tmszi merged 1 commit intoOSGeo:mainfrom
tmszi:fix-g_mapsets-write-mapsets-without-additional-empty-new-line
Sep 21, 2022
Merged

g.mapsets: Do not include additional empty new line#2586
tmszi merged 1 commit intoOSGeo:mainfrom
tmszi:fix-g_mapsets-write-mapsets-without-additional-empty-new-line

Conversation

@tmszi
Copy link
Member

@tmszi tmszi commented Sep 20, 2022 •
edited
Loading

Describe the bug
g.mapsets module writes to the file $(g.gisenv get="GISDBASE")/$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH additional empty new line.

To Reproduce
Steps to reproduce the behavior:

  1. Lanch GG with nc_spm_08_grass7 LOCATION and landsat MAPSET
  2. Run g.mapsets operation=set mapset=landsat
  3. Check the new line symbol \n in the file cat -e "$(g.gisenv get="GISDBASE")/$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH" and see additional new empty line.
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat
    
GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
$

Expected behavior
g.mapsets module should writes MAPSETs only without additional empty new line.

GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$

System description:

  • Operating System: all
  • GRASS GIS version: all

@tmszi
general/g.mapsets: fix write MAPSETS without additional empty new line
0c4a94b 
Current behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
$
```

Expected behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
```
@tmszi tmszi added bug Something isn't working C Related code is in C labels Sep 20, 2022
tmszi
tmszi commented Sep 20, 2022
View reviewed changes
general/g.mapsets/main.c
strcat(*path, " ");
strcat(*path, mapset);
} else {
strcat(*path, " ");
Copy link
Member Author

@tmszi tmszi Sep 20, 2022

Choose a reason for hiding this comment

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

Path here be string with following correct format e.g. "MAPSET MAPSET MAPSET" (which is correct input string for tokenize string),

grass/general/g.mapsets/main.c

Line 274 in 6253da1

tokens = G_tokenize(path, " ");

not "MAPSET MAPSET MAPSET " with additional empty space on the end of the string, which causes a new empty line to be written to the SEARCH_PATCH file.

@tmszi tmszi added this to the 8.2.1 milestone Sep 20, 2022
@tmszi tmszi changed the title general/g.mapsets: fix write MAPSETS without additional empty new line general/g.mapsets: fix write MAPSETs without additional empty new line Sep 20, 2022
@tmszi tmszi mentioned this pull request Sep 20, 2022
Merged
@tmszi tmszi merged commit 841e0b3 into OSGeo:main Sep 21, 2022
tmszi added a commit to tmszi/grass that referenced this pull request Sep 21, 2022
@tmszi
general/g.mapsets: fix write MAPSETS without additional empty new line (
5aae26b 
OSGeo#2586)

Current behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
$
```

Expected behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
```
tmszi added a commit to tmszi/grass that referenced this pull request Sep 21, 2022
@tmszi
general/g.mapsets: fix write MAPSETS without additional empty new line (
20bee01 
OSGeo#2586)

Current behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
$
```

Expected behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
```
tmszi added a commit to tmszi/grass that referenced this pull request Sep 21, 2022
@tmszi
general/g.mapsets: fix write MAPSETS without additional empty new line (
13cdec4 
OSGeo#2586)

Current behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
$
```

Expected behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
```
@tmszi tmszi deleted the fix-g_mapsets-write-mapsets-without-additional-empty-new-line branch September 21, 2022 19:02
ninsbl pushed a commit to ninsbl/grass that referenced this pull request Oct 26, 2022
@tmszi @ninsbl
general/g.mapsets: fix write MAPSETS without additional empty new line (
b49fc79 
OSGeo#2586)

Current behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
$
```

Expected behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
```
ninsbl pushed a commit to ninsbl/grass that referenced this pull request Feb 17, 2023
@tmszi @ninsbl
general/g.mapsets: fix write MAPSETS without additional empty new line (
7024566 
OSGeo#2586)

Current behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
$
```

Expected behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
```
marisn pushed a commit to marisn/grass that referenced this pull request Jun 2, 2023
@tmszi @marisn
general/g.mapsets: fix write MAPSETS without additional empty new line (
ed922a4 
OSGeo#2586)

Current behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
$
```

Expected behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
```
@wenzeslaus wenzeslaus changed the title general/g.mapsets: fix write MAPSETs without additional empty new line g.mapsets: Do not include additional empty new line Jun 6, 2023
neteler pushed a commit to nilason/grass that referenced this pull request Nov 7, 2023
@tmszi @neteler
general/g.mapsets: fix write MAPSETS without additional empty new line (
ff3ec42 
OSGeo#2586)

Current behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
$
```

Expected behavior:

```
GRASS nc_spm_08_grass7/landsat:~ > g.mapsets operation=set mapset=landsat

GRASS nc_spm_08_grass7/landsat:~ > cat -e "$(g.gisenv get="GISDBASE")/\
$(g.gisenv get="LOCATION_NAME")/$(g.gisenv get="MAPSET")/SEARCH_PATH"
landsat$
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrasovaa petrasovaa petrasovaa approved these changes

Assignees

No one assigned

Labels

bug Something isn't working C Related code is in C

Projects

None yet

Milestone

8.2.1

Development

Successfully merging this pull request may close these issues.

2 participants

@tmszi @petrasovaa