This commit is contained in:
parent
303ca4da0c
commit
4d69639580
33
libzypp-bnc-409927.patch
Normal file
33
libzypp-bnc-409927.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
Only in libzypp-5.16.1.orig/: libzypp-5.16.1
|
||||||
|
diff -ur libzypp-5.16.1.orig//zypp/PathInfo.cc libzypp-5.16.1//zypp/PathInfo.cc
|
||||||
|
--- libzypp-5.16.1.orig//zypp/PathInfo.cc 2008-10-16 16:11:34.000000000 +0200
|
||||||
|
+++ libzypp-5.16.1//zypp/PathInfo.cc 2008-10-16 16:23:24.000000000 +0200
|
||||||
|
@@ -598,6 +598,15 @@
|
||||||
|
// METHOD NAME : readdir
|
||||||
|
// METHOD TYPE : int
|
||||||
|
//
|
||||||
|
+
|
||||||
|
+ bool DirEntry::operator==( const DirEntry &rhs ) const
|
||||||
|
+ {
|
||||||
|
+ // if one of the types is not known, use the name only
|
||||||
|
+ if ( type == FT_NOT_AVAIL || rhs.type == FT_NOT_AVAIL )
|
||||||
|
+ return ( name == rhs.name );
|
||||||
|
+ return ((name == rhs.name ) && (type == rhs.type));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
int readdir( DirContent & retlist, const Pathname & path,
|
||||||
|
bool dots, PathInfo::Mode statmode )
|
||||||
|
{
|
||||||
|
diff -ur libzypp-5.16.1.orig//zypp/PathInfo.h libzypp-5.16.1//zypp/PathInfo.h
|
||||||
|
--- libzypp-5.16.1.orig//zypp/PathInfo.h 2008-10-16 16:11:34.000000000 +0200
|
||||||
|
+++ libzypp-5.16.1//zypp/PathInfo.h 2008-10-16 16:18:35.000000000 +0200
|
||||||
|
@@ -490,8 +490,7 @@
|
||||||
|
, type( type_r )
|
||||||
|
{}
|
||||||
|
|
||||||
|
- bool operator==( const DirEntry &rhs ) const
|
||||||
|
- { return ((name == rhs.name ) && (type == rhs.type)); }
|
||||||
|
+ bool operator==( const DirEntry &rhs ) const;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Returned by readdir. */
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 16 16:26:01 CEST 2008 - dmacvicar@suse.de
|
||||||
|
|
||||||
|
- don't take into account stat information when looking
|
||||||
|
for remote SHA1SUMS (part of bnc#409927)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Oct 14 16:15:09 CEST 2008 - jkupec@suse.cz
|
Tue Oct 14 16:15:09 CEST 2008 - jkupec@suse.cz
|
||||||
|
|
||||||
|
@ -25,9 +25,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Summary: Package, Patch, Pattern, and Product Management
|
Summary: Package, Patch, Pattern, and Product Management
|
||||||
Version: 5.16.1
|
Version: 5.16.1
|
||||||
Release: 1
|
Release: 2
|
||||||
Source: libzypp-5.16.1.tar.bz2
|
Source: libzypp-5.16.1.tar.bz2
|
||||||
Source1: libzypp-rpmlintrc
|
Source1: libzypp-rpmlintrc
|
||||||
|
Patch0: libzypp-bnc-409927.patch
|
||||||
Prefix: /usr
|
Prefix: /usr
|
||||||
Provides: yast2-packagemanager
|
Provides: yast2-packagemanager
|
||||||
Obsoletes: yast2-packagemanager
|
Obsoletes: yast2-packagemanager
|
||||||
@ -96,6 +97,7 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir build
|
mkdir build
|
||||||
@ -228,6 +230,9 @@ rm -rf "$RPM_BUILD_ROOT"
|
|||||||
%{_libdir}/pkgconfig/libzypp.pc
|
%{_libdir}/pkgconfig/libzypp.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 16 2008 dmacvicar@suse.de
|
||||||
|
- don't take into account stat information when looking
|
||||||
|
for remote SHA1SUMS (part of bnc#409927)
|
||||||
* Tue Oct 14 2008 jkupec@suse.cz
|
* Tue Oct 14 2008 jkupec@suse.cz
|
||||||
- don't initialize servicesTargetDistro via global ZYpp instance in
|
- don't initialize servicesTargetDistro via global ZYpp instance in
|
||||||
RepoManagerOptions() constructor (bnc #435184)
|
RepoManagerOptions() constructor (bnc #435184)
|
||||||
|
Loading…
Reference in New Issue
Block a user