Mailinglist Archive: opensuse-commit (1929 mails)
| < Previous | Next > |
commit inst-source-utils for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sun, 16 Oct 2011 22:45:00 +0200
- Message-id: <20111016204500.DF9ED20235@hilbert.suse.de>
Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory
checked in at Sun Oct 16 22:45:00 CEST 2011.
--------
--- openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2011-10-16 12:50:35.000000000 +0200
+++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes
2011-10-16 21:57:34.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Oct 16 19:55:51 UTC 2011 - lars@xxxxxxxxxxxxxxxxxxxx
+
+- to too much quoting in create_package_descr
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ inst-source-utils.spec ++++++
--- /var/tmp/diff_new_pack.4aqoHj/_old 2011-10-16 22:44:51.000000000 +0200
+++ /var/tmp/diff_new_pack.4aqoHj/_new 2011-10-16 22:44:51.000000000 +0200
@@ -19,12 +19,11 @@
Name: inst-source-utils
Summary: Utilities for creating customized installation sources
-Version: 2011.10.14
+Version: 2011.10.16
Release: 1
Url: http://en.opensuse.org/Inst-source-utils
License: GPLv2+
Group: System/YaST
-AutoReqProv: on
BuildArch: noarch
Requires: gpg2 recode
Obsoletes: autoyast2-utils <= 2.14.10
++++++ inst-source-utils.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2011-10-14
19:04:26.000000000 +0200
+++ new/inst-source-utils/usr/bin/create_package_descr 2011-10-16
21:55:30.000000000 +0200
@@ -242,7 +242,7 @@
}
$pkg_main = OpenFileWrite ( "$output_dir/packages" );
-WriteSEntry( "$pkg_main", "Ver", "2.0" );
+WriteSEntry( $pkg_main, "Ver", "2.0" );
foreach $lang (@LANGUAGES) {
$pkg_lang{$lang} = OpenFileWrite ( "$output_dir/packages.$lang_alias{$lang}"
);
WriteSEntry( $pkg_lang{$lang}, "Ver", "2.0" );
@@ -250,8 +250,8 @@
$pkg_du = OpenFileWrite ( "$output_dir/packages.DU" );
$pkg_fl = OpenFileWrite ( "$output_dir/packages.FL" ) if $do_file_list;
-WriteSEntry( "$pkg_du", "Ver", "2.0" );
-WriteSEntry( "$pkg_fl", "Ver", "2.0" ) if $do_file_list;
+WriteSEntry( $pkg_du, "Ver", "2.0" );
+WriteSEntry( $pkg_fl, "Ver", "2.0" ) if $do_file_list;
$media_number = 0;
$allcounter = 0;
@@ -392,44 +392,44 @@
}
}
- WriteSeparator( "$pkg_main" );
- WriteComment( "$pkg_main", @SAVEARGS ) unless $wrote_comment;
- WriteSeparator( "$pkg_main" ) unless $wrote_comment;
+ WriteSeparator( $pkg_main );
+ WriteComment( $pkg_main, @SAVEARGS ) unless $wrote_comment;
+ WriteSeparator( $pkg_main ) unless $wrote_comment;
$wrote_comment = 1;
- WriteSEntry( "$pkg_main", "Pkg", "$res{1000}[0] $res{1001}[0]
$res{1002}[0] $file_arch");
+ WriteSEntry( $pkg_main, "Pkg", "$res{1000}[0] $res{1001}[0] $res{1002}[0]
$file_arch");
if ($do_sha256 eq "1") {
- WriteSEntry( "$pkg_main", "Cks", "SHA256 $checksum") if ($checksum);
+ WriteSEntry( $pkg_main, "Cks", "SHA256 $checksum") if ($checksum);
} else {
- WriteSEntry( "$pkg_main", "Cks", "SHA1 $checksum") if ($checksum);
+ WriteSEntry( $pkg_main, "Cks", "SHA1 $checksum") if ($checksum);
}
if ( $res{1044}[0] ) {
# has src, so it's a binary package
- WriteMEntry( "$pkg_main", "Req", @{$res{1049}} );
- WriteMEntry( "$pkg_main", "Prq", @prereq );
- WriteMEntry( "$pkg_main", "Prv", @{$res{1047}} );
- WriteMEntry( "$pkg_main", "Con", @{$res{1054}} );
- WriteMEntry( "$pkg_main", "Obs", @{$res{1090}} );
- WriteMEntry( "$pkg_main", "Rec", filter_strong(\%res, 1156, 1158));
- WriteMEntry( "$pkg_main", "Sug", filter_weak(\%res, 1156, 1158));
- WriteMEntry( "$pkg_main", "Sup", filter_strong(\%res, 1159, 1161));
- WriteMEntry( "$pkg_main", "Enh", filter_weak(\%res, 1159, 1161));
- WriteSEntry( "$pkg_main", "Grp", $res{1016}[0] );
- WriteSEntry( "$pkg_main", "Lic", $res{1014}[0] );
- WriteSEntry( "$pkg_main", "Vnd", $res{1011}[0] ) if $add_vendor;
- WriteSEntry( "$pkg_main", "Src", $srcrpm );
- WriteSEntry( "$pkg_main", "Tim", $res{1006}[0] );
- WriteSEntry( "$pkg_main", "Loc", "$media_number $filename");
+ WriteMEntry( $pkg_main, "Req", @{$res{1049}} );
+ WriteMEntry( $pkg_main, "Prq", @prereq );
+ WriteMEntry( $pkg_main, "Prv", @{$res{1047}} );
+ WriteMEntry( $pkg_main, "Con", @{$res{1054}} );
+ WriteMEntry( $pkg_main, "Obs", @{$res{1090}} );
+ WriteMEntry( $pkg_main, "Rec", filter_strong(\%res, 1156, 1158));
+ WriteMEntry( $pkg_main, "Sug", filter_weak(\%res, 1156, 1158));
+ WriteMEntry( $pkg_main, "Sup", filter_strong(\%res, 1159, 1161));
+ WriteMEntry( $pkg_main, "Enh", filter_weak(\%res, 1159, 1161));
+ WriteSEntry( $pkg_main, "Grp", $res{1016}[0] );
+ WriteSEntry( $pkg_main, "Lic", $res{1014}[0] );
+ WriteSEntry( $pkg_main, "Vnd", $res{1011}[0] ) if $add_vendor;
+ WriteSEntry( $pkg_main, "Src", $srcrpm );
+ WriteSEntry( $pkg_main, "Tim", $res{1006}[0] );
+ WriteSEntry( $pkg_main, "Loc", "$media_number $filename");
} else {
- WriteMEntry( "$pkg_main", "Req", @{$res{1049}} ) if $src_requires;
- WriteSEntry( "$pkg_main", "Loc", "$media_number $filename $file_arch");
+ WriteMEntry( $pkg_main, "Req", @{$res{1049}} ) if $src_requires;
+ WriteSEntry( $pkg_main, "Loc", "$media_number $filename $file_arch");
}
- WriteSEntry( "$pkg_main, "Siz", "$filesize $res{1009}[0]" );
+ WriteSEntry( $pkg_main, "Siz", "$filesize $res{1009}[0]" );
- WriteAnyEntry( "$pkg_main , $xtaglist{$rpm_name} ) if
($xtaglist{$rpm_name} && $res{1044}[0]);
+ WriteAnyEntry( $pkg_main, $xtaglist{$rpm_name} ) if ($xtaglist{$rpm_name}
&& $res{1044}[0]);
if ($SEEN_PACKAGE{"$rpm_name $res{1001}[0] $res{1002}[0]"} && $allow_shr) {
$found_in = $SEEN_PACKAGE{"$rpm_name $res{1001}[0] $res{1002}[0]"};
- WriteSEntry( "$pkg_main", "Shr", "$res{1000}[0] $res{1001}[0]
$res{1002}[0] $found_in");
+ WriteSEntry( $pkg_main, "Shr", "$res{1000}[0] $res{1001}[0]
$res{1002}[0] $found_in");
} else {
if ( $pdb_data_dir ) {
my $pac_rpm_name = $rpm_name;
@@ -459,9 +459,9 @@
warn "ERROR: newline in summary for package
$pac_rpm_name\n";
$pacdata{$pac_rpm_name}{"$default_lang"}{"label"} =~ s/\n/
/g;
}
- WriteMEntry( "$pkg_main", "Aut",
@{$pacdata{$pac_rpm_name}{"authorname"}} );
+ WriteMEntry( $pkg_main, "Aut",
@{$pacdata{$pac_rpm_name}{"authorname"}} );
if ( $do_keywords eq "1" && $pacdata{$pac_rpm_name}{"keywords"} ) {
- WriteMEntry( "$pkg_main", "Kwd",
@{$pacdata{$pac_rpm_name}{"keywords"}} );
+ WriteMEntry( $pkg_main, "Kwd",
@{$pacdata{$pac_rpm_name}{"keywords"}} );
}
foreach $lang (@LANGUAGES) {
WriteSeparator( $pkg_lang{$lang} );
@@ -537,12 +537,12 @@
print "INFO: following packages were ignored: $ignored_packages\n";
}
-close ( "$pkg_main" );
+close ( $pkg_main );
foreach $lang (@LANGUAGES) {
close ( "$pkg_lang{$lang}" );
}
-close ( "$pkg_du" );
-close ( "$pkg_fl" ) if $do_file_list;
+close ( $pkg_du );
+close ( $pkg_fl ) if $do_file_list;
if ($num_pdb_records) {
warn ("used pdb records $num_pdb_records\n") if $num_pdb_records;
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |