Issue 13344 - USER_FILE_BODY used in files.scp, but it is undefined
Summary: USER_FILE_BODY used in files.scp, but it is undefined
Status: CLOSED FIXED
Alias: None
Product: Installation
Classification: Application
Component: code (show other issues)
Version: 644
Hardware: All Windows 2000
: P1 (highest) Trivial (vote)
Target Milestone: OOo 1.1 Beta2
Assignee: Martin Hollmichel
QA Contact: issues@installation
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-04-12 16:59 UTC by quetschke
Modified: 2003-09-08 16:53 UTC (History)
2 users (show)

See Also:
Issue Type: DEFECT
Latest Confirmation in: ---
Developer Difficulty: ---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.
Description quetschke 2003-04-12 16:59:12 UTC 
CCing mh, he did the merge.

Branch cws_srx644_ooo20030412.

The build breaks in scp/source/office with:
scpcomp -s ..\..\wntmsci7.pro\misc\fam\files.pre -o
..\..\wntmsci7.pro\par\fam\files.par
Making script particel: ..\..\wntmsci7.pro\par\fam\files.par
syntax error in 10109

Because USER_FILE_BODY is NOT defined.  That changed yesterday, in
 scp/inc/gcfg.inc rev1.60.2.3.6.1.
That merge converted USER_FILE_BODY to TXT_OVERWRITE_FILE_BODY.

But not everywhere ...

I "fixed" this by applying:

--- scp/inc/gcfg.inc	11 Apr 2003 12:03:13 -0000	1.60.2.3.6.1
+++ scp/inc/gcfg.inc	12 Apr 2003 12:45:24 -0000
@@ -185,6 +185,9 @@
 #define TXT_OVERWRITE_FILE_BODY FILE_BODY \
 	UnixRights		= 644

+#define USER_FILE_BODY FILE_BODY \
+	UnixRights		= 644
+
 #define TODAY_FILE_BODY \
 	Carrier			= GID_DATACARRIER;	\
     Date            = GCFG_TODAY_DATE_STAMP;  \

This is only a workaround to keep the build running, this should be fixed in a
propper way.
Comment 1 quetschke 2003-04-12 17:00:21 UTC 
Changed target.
Comment 2 Martin Hollmichel 2003-04-13 08:24:28 UTC 
I did a faulty conflict resolution, will fix it when resync of
20030412 is complete and I can verify it.
Comment 3 Martin Hollmichel 2003-04-17 10:22:40 UTC 
now fixed on 20030412
Comment 4 Martin Hollmichel 2003-06-16 16:50:11 UTC 
closed.