Opened 3 years ago

Last modified 3 years ago

#976 qa enhancement

Setup diversions for file conflicts

Reported by: skylar Owned by: skylar
Priority: major Milestone: 3.4.0-build_ng
Component: Both Version: 3.4.0
Keywords: Cc:
Blocked By: Blocking:
Estimated Hours: 2 Total Hours: 0

Description


Change History (22)

comment:1 Changed 3 years ago by skylar

In 5760//cluster/svnroot:

setting diversion and conflict config file re #976

comment:2 Changed 3 years ago by skylar

In 5761//cluster/svnroot:

create conflict_files.conf in pre-install re #976

comment:3 Changed 3 years ago by skylar

In 5762//cluster/svnroot:

generate proper shell config re #976

comment:4 Changed 3 years ago by skylar

In 5763//cluster/svnroot:

exclude svn re #976

comment:5 Changed 3 years ago by skylar

In 5764//cluster/svnroot:

exclude empty svn re #976

comment:6 Changed 3 years ago by skylar

In 5765//cluster/svnroot:

add all conflicts as diversions re #976

comment:7 Changed 3 years ago by skylar

In 5766//cluster/svnroot:

rename diverted files re #976

comment:8 Changed 3 years ago by skylar

In 5767//cluster/svnroot:

try w/o --local re #976

comment:9 Changed 3 years ago by skylar

In 5768//cluster/svnroot:

mtab should not be needed anymore re #976

comment:10 Changed 3 years ago by skylar

In 5769//cluster/svnroot:

mtab should not be needed anymore re #976

comment:11 Changed 3 years ago by skylar

In 5770//cluster/svnroot:

likewise bluetooth re #976

comment:12 Changed 3 years ago by skylar

In 5771//cluster/svnroot:

rcS removed re #976

comment:13 Changed 3 years ago by skylar

In 5772//cluster/svnroot:

re-add removed files, try suppressing diversion for bccd re #976

comment:14 Changed 3 years ago by skylar

for next time: figure out how to divert config files

comment:15 Changed 3 years ago by skylar

In 5773//cluster/svnroot:

be explicit in diversion options re #976

comment:16 Changed 3 years ago by skylar

this works as root:

dpkg --force-confnew -i bccd.noarch.deb

followed by this to fix dep problems if needed:

apt-get update && apt-get -o Dpkg::Options::="--force-confnew" install -yf

Last edited 3 years ago by skylar (previous) (diff)

comment:17 Changed 3 years ago by skylar

  • Status changed from new to qa

comment:18 Changed 3 years ago by skylar

testers: should be able to run the install process w/o prompts

comment:19 Changed 3 years ago by skylar

In 5778//cluster/svnroot:

add apt sources re #976

comment:20 Changed 3 years ago by skylar

In 5779//cluster/svnroot:

add to sources.list.d re #976

comment:21 Changed 3 years ago by skylar

In 5780//cluster/svnroot:

remove apt diversion re #976

comment:22 Changed 3 years ago by skylar

In 5815//cluster/svnroot:

overwrite existing configs re #976

Note: See TracTickets for help on using tickets.