Diff

Differences From Artifact [bf14c565da]:

To Artifact [f9a8f2229a]:


298
299
300
301
302
303
304





305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
		set pkgdir $currpkginfo(pkgdir)
		set multifile $currpkginfo(multifile)
		set extfiletail $currpkginfo(extfile)

		set workdir [file join $dstdir package name $pkg ver $ver arch $arch]
		set regfile [file join $workdir file]
		set extfile [file join $workdir $extfiletail]





		catch {
			file mkdir $workdir
		}

		if {$multifile} {
			if {[file exists $extfile] && !$force} {
				continue
			}

			if {[catch {
				cd $pkgdir

				file delete -- $extfile
				exec zip -r $extfile . -x build.log
			} err]} {
				puts "Error while zipping: $err"







>
>
>
>
>





<
<
<
<







298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314




315
316
317
318
319
320
321
		set pkgdir $currpkginfo(pkgdir)
		set multifile $currpkginfo(multifile)
		set extfiletail $currpkginfo(extfile)

		set workdir [file join $dstdir package name $pkg ver $ver arch $arch]
		set regfile [file join $workdir file]
		set extfile [file join $workdir $extfiletail]

		if {[file exists $extfile] && !$force} {
			continue
		}

		catch {
			file mkdir $workdir
		}

		if {$multifile} {




			if {[catch {
				cd $pkgdir

				file delete -- $extfile
				exec zip -r $extfile . -x build.log
			} err]} {
				puts "Error while zipping: $err"
500
501
502
503
504
505
506


507
508
509
510
511
512
513
514
515

	set seen_entities [list]
	foreach pkgdata [lsort -dictionary [array names pkginfo]] {
		unset -nocomplain entity
		lappend entity entity package

		for {set endidx 0} {$endidx < [llength $entfields]} {incr endidx} {


			lappend entity [lindex $entfields $endidx]
			lappend entity [lindex $pkgdata $endidx]

			if {[lsearch -exact $seen_entities $entity] != -1} {
				continue
			}
			lappend seen_entities $entity

			create_entity_file $entity $dstdir $pkginfo_arrlist







>
>
|
|







501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518

	set seen_entities [list]
	foreach pkgdata [lsort -dictionary [array names pkginfo]] {
		unset -nocomplain entity
		lappend entity entity package

		for {set endidx 0} {$endidx < [llength $entfields]} {incr endidx} {
			set enttype [lindex $entfields $endidx]
			set entval [lindex $pkgdata $endidx]
			lappend entity $enttype
			lappend entity $entval

			if {[lsearch -exact $seen_entities $entity] != -1} {
				continue
			}
			lappend seen_entities $entity

			create_entity_file $entity $dstdir $pkginfo_arrlist