Personally, I think migrating from svn to git while in the midst of also trying to cut a release was somewhat unwise... As far as SVN being read only, obviously I was able to commit to the AOO417 branch. So I've no idea what the status is... I was just as surprised, but since my entire macOS (and CentOS) build servers were already setup to use SVN, and I wanted to make sure that 4.1.7 still built OK, I went the most expedite route.
> On Aug 14, 2019, at 11:57 AM, Matthias Seidel <matthias.sei...@hamburg.de> > wrote: > > Shouldn't SVN be read-only now?! > > This will introduce some inconsistencies to Git now... > > Matthias > > Am 14.08.19 um 17:51 schrieb j...@apache.org: >> Author: jim >> Date: Wed Aug 14 15:51:11 2019 >> New Revision: 1865164 >> >> URL: http://svn.apache.org/viewvc?rev=1865164&view=rev >> Log: >> Align w/ 42X and trunk >> >> Modified: >> openoffice/branches/AOO417/main/sal/osl/unx/nlsupport.c >> >> Modified: openoffice/branches/AOO417/main/sal/osl/unx/nlsupport.c >> URL: >> http://svn.apache.org/viewvc/openoffice/branches/AOO417/main/sal/osl/unx/nlsupport.c?rev=1865164&r1=1865163&r2=1865164&view=diff >> ============================================================================== >> --- openoffice/branches/AOO417/main/sal/osl/unx/nlsupport.c (original) >> +++ openoffice/branches/AOO417/main/sal/osl/unx/nlsupport.c Wed Aug 14 >> 15:51:11 2019 >> @@ -876,31 +876,23 @@ void _imp_getProcessLocale( rtl_Locale * >> * This is a hack. We know that we are setting some envvars here >> * and due to https://bz.apache.org/ooo/show_bug.cgi?id=127965 >> * we need to update PATH on macOS. Doing it here ensures >> - * that it's done but it's not the right location to be doing >> + * that it's done but it's not the perfect location to be doing >> * this. >> - * >> - * Also address https://bz.apache.org/ooo/show_bug.cgi?id=127966 >> - * here as well :/ >> */ >> opath = getenv ( "PATH" ); >> - slen = strlen( "/usr/local/bin" ) + 1; >> - if ( opath != NULL ) >> - slen += strlen( ":" ) + strlen( opath ); >> - npath = malloc( slen ); >> - if ( opath != NULL ) { >> - strcat( npath, opath ); >> - strcat( npath, ":" ); >> - } >> - strcat( npath, "/usr/local/bin" ); /* We are adding at the end */ >> - setenv("PATH", npath, 1 ); >> - free(npath); >> - >> -/* https://bz.apache.org/ooo/show_bug.cgi?id=127966 */ >> - opath = getenv ( "HOME" ); >> - if ( opath && *opath ) { >> - chdir ( opath ); >> - } else { >> - chdir ( "/tmp" ); >> + if (!strstr ( opath, "/usr/local/bin" )) { >> + slen = strlen( "/usr/local/bin" ) + 1; >> + if ( opath != NULL ) >> + slen += strlen( ":" ) + strlen( opath ); >> + npath = malloc( slen ); >> + *npath = '\0'; >> + if ( opath != NULL ) { >> + strcat( npath, opath ); >> + strcat( npath, ":" ); >> + } >> + strcat( npath, "/usr/local/bin" ); /* We are adding at the end */ >> + setenv("PATH", npath, 1 ); >> + free(npath); >> } >> >> #ifdef DEBUG >> >> > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
