samba - problem with conflict between -main and -docs

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

samba - problem with conflict between -main and -docs

Markus Lude-3
Hello,

with latest samba commits I have some problem with updating the
packages. Packages were built by myself.

Both samba and samba-docs were installed.

$ sudo pkg_add -D unsigned -i -u samba samba-docs
Password:
samba-3.6.15p10+samba-docs-3.6.15->samba-3.6.15p11+samba-docs-3.6.15p0: internal conflict between samba-3.6.15p11 and samba-docs-3.6.15p0
Couldn't find updates for cups-libs-2.0.1, iniparser-3.1p0, libexecinfo-0.2p4v0, libiconv-1.14p1, libtalloc-2.0.1p0, popt-1.16, samba-3.6.15p10, samba-docs-3.6.15, tdb-1.2.7p0

using -r got only the samba package updated, the docs were removed:

$ sudo pkg_add -D unsigned -i -r samba samba-docs
samba-3.6.15p10+samba-docs-3.6.15->samba-3.6.15p11: ok
Cannot replace samba-3.6.15p11 in samba-docs-3.6.15p0: just got
installed
Read shared items: ok
Look in /usr/local/share/doc/pkg-readmes for extra documentation.
--- samba-docs-3.6.15p0 -------------------
Can't install samba-docs-3.6.15p0: replacing just installed
fuseki:~/work/fuseki> sudo pkg_add -D unsigned -i -u samba samba-docs
Can't find samba-docs
Problem finding samba-docs

so I tried to install the docs package, which failed:

$ sudo pkg_add -D unsigned -i samba-docs
Can't install samba-docs-3.6.15p0 because of conflicts (samba-3.6.15p11)
--- samba-docs-3.6.15p0 -------------------
Can't install samba-docs-3.6.15p0: conflicts

How could I install the docs package again?

Regards,
Markus

Reply | Threaded
Open this post in threaded view
|

Re: samba - problem with conflict between -main and -docs

Jeremie Courreges-Anglas-2
Markus Lude <[hidden email]> writes:

> Hello,

Hi,

> with latest samba commits I have some problem with updating the
> packages. Packages were built by myself.
>
> Both samba and samba-docs were installed.
>
> $ sudo pkg_add -D unsigned -i -u samba samba-docs
> Password:
> samba-3.6.15p10+samba-docs-3.6.15->samba-3.6.15p11+samba-docs-3.6.15p0: internal conflict between samba-3.6.15p11 and samba-docs-3.6.15p0
> Couldn't find updates for cups-libs-2.0.1, iniparser-3.1p0, libexecinfo-0.2p4v0, libiconv-1.14p1, libtalloc-2.0.1p0, popt-1.16, samba-3.6.15p10, samba-docs-3.6.15, tdb-1.2.7p0
>
> using -r got only the samba package updated, the docs were removed:
>
> $ sudo pkg_add -D unsigned -i -r samba samba-docs
> samba-3.6.15p10+samba-docs-3.6.15->samba-3.6.15p11: ok
> Cannot replace samba-3.6.15p11 in samba-docs-3.6.15p0: just got
> installed
> Read shared items: ok
> Look in /usr/local/share/doc/pkg-readmes for extra documentation.
> --- samba-docs-3.6.15p0 -------------------
> Can't install samba-docs-3.6.15p0: replacing just installed
> fuseki:~/work/fuseki> sudo pkg_add -D unsigned -i -u samba samba-docs
> Can't find samba-docs
> Problem finding samba-docs
>
> so I tried to install the docs package, which failed:
>
> $ sudo pkg_add -D unsigned -i samba-docs
> Can't install samba-docs-3.6.15p0 because of conflicts (samba-3.6.15p11)
> --- samba-docs-3.6.15p0 -------------------
> Can't install samba-docs-3.6.15p0: conflicts
>
> How could I install the docs package again?

I've just committed a fix for this.  Just rebuild your samba packages
from cvs HEAD.

As a quick fix you can just edit /var/db/pkg/samba-3.6.15p11/+CONTENTS
then install the samba-docs-3.6.15p0 package.

--- +CONTENTS.orig Thu Feb  5 03:10:47 2015
+++ +CONTENTS Thu Feb  5 03:11:11 2015
@@ -7,7 +7,7 @@
 +DESC
 @sha 8uSQYeC7tFGTWaUIG3C6Xk4AQprKvr+27lN0XxR/Oug=
 @size 703
-@conflict samba-docs-<=3.6.15
+@conflict samba-docs-<3.6.15p0
 @pkgpath net/samba
 @pkgpath net/samba,ads,-main
 @pkgpath net/samba,cups[,ads][,ldap]

Sorry for the bother.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: samba - problem with conflict between -main and -docs

Ian McWilliam-2
On 5/02/2015 1:15 PM, Jérémie Courrèges-Anglas wrote:

> Markus Lude <[hidden email]> writes:
>
>> Hello,
> Hi,
>
>> with latest samba commits I have some problem with updating the
>> packages. Packages were built by myself.
>>
>> Both samba and samba-docs were installed.
>>
>> $ sudo pkg_add -D unsigned -i -u samba samba-docs
>> Password:
>> samba-3.6.15p10+samba-docs-3.6.15->samba-3.6.15p11+samba-docs-3.6.15p0: internal conflict between samba-3.6.15p11 and samba-docs-3.6.15p0
>> Couldn't find updates for cups-libs-2.0.1, iniparser-3.1p0, libexecinfo-0.2p4v0, libiconv-1.14p1, libtalloc-2.0.1p0, popt-1.16, samba-3.6.15p10, samba-docs-3.6.15, tdb-1.2.7p0
>>
>> using -r got only the samba package updated, the docs were removed:
>>
>> $ sudo pkg_add -D unsigned -i -r samba samba-docs
>> samba-3.6.15p10+samba-docs-3.6.15->samba-3.6.15p11: ok
>> Cannot replace samba-3.6.15p11 in samba-docs-3.6.15p0: just got
>> installed
>> Read shared items: ok
>> Look in /usr/local/share/doc/pkg-readmes for extra documentation.
>> --- samba-docs-3.6.15p0 -------------------
>> Can't install samba-docs-3.6.15p0: replacing just installed
>> fuseki:~/work/fuseki> sudo pkg_add -D unsigned -i -u samba samba-docs
>> Can't find samba-docs
>> Problem finding samba-docs
>>
>> so I tried to install the docs package, which failed:
>>
>> $ sudo pkg_add -D unsigned -i samba-docs
>> Can't install samba-docs-3.6.15p0 because of conflicts (samba-3.6.15p11)
>> --- samba-docs-3.6.15p0 -------------------
>> Can't install samba-docs-3.6.15p0: conflicts
>>
>> How could I install the docs package again?
> I've just committed a fix for this.  Just rebuild your samba packages
> from cvs HEAD.
>
> As a quick fix you can just edit /var/db/pkg/samba-3.6.15p11/+CONTENTS
> then install the samba-docs-3.6.15p0 package.
>
> --- +CONTENTS.orig Thu Feb  5 03:10:47 2015
> +++ +CONTENTS Thu Feb  5 03:11:11 2015
> @@ -7,7 +7,7 @@
>   +DESC
>   @sha 8uSQYeC7tFGTWaUIG3C6Xk4AQprKvr+27lN0XxR/Oug=
>   @size 703
> -@conflict samba-docs-<=3.6.15
> +@conflict samba-docs-<3.6.15p0
>   @pkgpath net/samba
>   @pkgpath net/samba,ads,-main
>   @pkgpath net/samba,cups[,ads][,ldap]
>
> Sorry for the bother.
Sorry guys, been on holidays so I've missed the last few bits of discussion.

Will test this as soon as I get back in font a a current machine.

Ian McWilliam