[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.6.1
Modestas Vainius
modax at alioth.debian.org
Sun Feb 7 08:22:34 UTC 2010
The following commit has been merged in the master branch:
commit 3672d107f627f3129b9e4aa93c524ea70529359c
Author: Modestas Vainius <modestas at vainius.eu>
Date: Sat Feb 6 16:03:23 2010 +0200
pkgkde-symbolshelper create/patch: arch specific files/patches are passed via @ARGV.
Hence -d option has been removed from both subcommands.
---
debian/changelog | 2 ++
symbolshelper/pkgkde-symbolshelper | 22 +++++++++++++---------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2711e52..066d986 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ pkg-kde-tools (0.6.1) UNRELEASED; urgency=low
read from;
- if it is specified without argument, dump to stdout;
- if it is specified with argument, dump to the file in argument.
+ * pkgkde-symbolshelper create/patch: arch specific files/patches are passed
+ via @ARGV now.
-- Modestas Vainius <modax at debian.org> Sat, 06 Feb 2010 15:05:44 +0200
diff --git a/symbolshelper/pkgkde-symbolshelper b/symbolshelper/pkgkde-symbolshelper
index f47fd28..2f29ff5 100755
--- a/symbolshelper/pkgkde-symbolshelper
+++ b/symbolshelper/pkgkde-symbolshelper
@@ -186,20 +186,24 @@ sub _create_symfile {
}
sub subcommand_create {
- my @opt_dirs;
my %opts = (
get_common_options("oav"),
- "directory|d=s" => \@opt_dirs,
);
if (GetOptions(%opts)) {
- check_mandatory_options("", "",
- scalar(@opt_dirs), "symbol file directory option (-d) is mandatory");
+ unless (defined $opt_out) {
+ error("output file option (-o) is mandatory");
+ }
# Load symbol files
+ my @input_files = @ARGV;
my %symfiles;
my $str_arches = join("|", get_valid_arches());
my $filename_re = qr/.*?[_.]($str_arches)$/;
- for my $f (@opt_dirs) {
+
+ unless (@input_files) {
+ error("please pass files/directory with arch specific symbol files");
+ }
+ for my $f (@input_files) {
if (-d $f) {
opendir(DIR, $f) or error("unable to open directory: $f");
while (my $filename = readdir(DIR)) {
@@ -276,22 +280,22 @@ sub subcommand_create {
}
sub subcommand_patch {
- my @opt_diffs;
my $opt_base;
+ my @input_patches;
my %opts = (
get_common_options("oipavV"),
- "diff|d=s" => \@opt_diffs,
"base|b=s" => \$opt_base,
);
if (GetOptions(%opts)) {
check_mandatory_options("p", "");
+ @input_patches = @ARGV;
unless ($opt_in) {
$opt_in = find_package_symbolfile_path($opt_package, $opt_arch);
error("symbol template file was not found for package '$opt_package'")
unless (defined $opt_in && -r $opt_in);
}
$opt_base = $opt_in unless $opt_base;
- push @opt_diffs, "-" unless @opt_diffs;
+ push @input_patches, "-" unless @input_patches;
# Load input symfile
my $symfile = Debian::PkgKde::SymbolsHelper::SymbolFile->new(
@@ -328,7 +332,7 @@ sub subcommand_patch {
}
return @patches;
};
- for my $f (@opt_diffs) {
+ for my $f (@input_patches) {
if (-d $f) {
opendir(DIR, $f) or error("unable to open directory with patches: $f");
while (my $filename = readdir(DIR)) {
--
Debian Qt/KDE packaging tools
More information about the pkg-kde-commits
mailing list