Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory checked
in at 2013-10-02 13:31:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzypp (Old)
and /work/SRC/openSUSE:Factory/.libzypp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2013-09-26
11:48:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2013-10-02
13:31:15.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Sep 29 01:15:02 CEST 2013 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-13.7.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-13.7.0/package/libzypp.changes
new/libzypp-13.7.0/package/libzypp.changes
--- old/libzypp-13.7.0/package/libzypp.changes 2013-09-22 01:19:33.000000000
+0200
+++ new/libzypp-13.7.0/package/libzypp.changes 2013-09-29 01:20:02.000000000
+0200
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Sun Sep 29 01:15:02 CEST 2013 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
Sun Sep 22 01:14:26 CEST 2013 - m...@suse.de
- Update zypp-po.tar.bz2
Files old/libzypp-13.7.0/po/zypp-po.tar.bz2 and
new/libzypp-13.7.0/po/zypp-po.tar.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-13.7.0/zypp/media/MediaHandler.cc
new/libzypp-13.7.0/zypp/media/MediaHandler.cc
--- old/libzypp-13.7.0/zypp/media/MediaHandler.cc 2013-04-19
14:01:30.000000000 +0200
+++ new/libzypp-13.7.0/zypp/media/MediaHandler.cc 2013-09-27
13:21:43.000000000 +0200
@@ -509,7 +509,7 @@
{
bool _isAttached = false;
- AttachedMedia ref( attachedMedia());
+ AttachedMedia ref( attachedMedia() );
if( ref.mediaSource )
{
time_t old_mtime = _attach_mtime;
@@ -529,11 +529,13 @@
MountEntries entries( MediaManager::getMountEntries());
for_( e, entries.begin(), entries.end() )
{
+ if ( ref.attachPoint->path != Pathname(e->dir) )
+ continue; // at least the mount points must match
+
bool is_device = false;
PathInfo dev_info;
-
if( str::hasPrefix( Pathname(e->src).asString(), "/dev/" ) &&
- dev_info(e->src) && dev_info.isBlk())
+ dev_info(e->src) && dev_info.isBlk() )
{
is_device = true;
}
@@ -544,8 +546,7 @@
std::string mtype(matchMountFs ? e->type : ref.mediaSource->type);
MediaSource media(mtype, e->src, dev_info.major(), dev_info.minor());
- if( ref.mediaSource->equals( media) &&
- ref.attachPoint->path == Pathname(e->dir))
+ if( ref.mediaSource->equals( media ) )
{
DBG << "Found media device "
<< ref.mediaSource->asString()
@@ -569,24 +570,34 @@
matchMountFs = false;
else if ( ( e->type == "cifs" || e->type == "smb" ) && (
ref.mediaSource->type == "cifs" || ref.mediaSource->type == "smb" ) )
matchMountFs = false;
+ else
+ continue; // different types cannot match
}
- std::string mtype(matchMountFs ? e->type : ref.mediaSource->type);
- MediaSource media(mtype, e->src);
+ // Here: Types are ok or not to check.
+ // Check the name except for nfs (bnc#804544; symlink resolution in
mount path)
+ //
+ // [fibonacci]$ ls -l /Local/ma/c12.1
+ // lrwxrwxrwx /Local/ma/c12.1 -> zypp-SuSE-Code-12_1-Branch/
+ //
+ // [localhost]$ mount -t nfs4 fibonacci:/Local/ma/c12.1 /mnt
+ // [localhost]$ mount
+ // fibonacci:/Local/ma/zypp-SuSE-Code-12_1-Branch on /mnt
+
+ // std::string mtype(matchMountFs ? e->type :
ref.mediaSource->type);
+ // MediaSource media(mtype, e->src);
- if( ref.mediaSource->equals( media) &&
- ref.attachPoint->path == Pathname(e->dir))
+ if( ref.mediaSource->name == e->src || str::hasPrefix(
ref.mediaSource->type, "nfs" ) )
{
DBG << "Found media name "
- << ref.mediaSource->asString()
- << " in the mount table as " << e->src << std::endl;
+ << ref.mediaSource->asString()
+ << " in the mount table as " << e->src << std::endl;
_isAttached = true;
break;
}
}
else
{
- if(ref.mediaSource->bdir == e->src &&
- ref.attachPoint->path == Pathname(e->dir))
+ if ( ref.mediaSource->bdir == e->src )
{
DBG << "Found bound media "
<< ref.mediaSource->asString()
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
